Changeset [bd92d30081f54964f494a89d289ebee9872e88ff] by Marnen Laibow-Koser
Revision bd92d30081f54964f494a89d289ebee9872e88ff,
committed by Marnen Laibow-Koser
· September 1st, 2011 @ 11:07 PM
Merge branch 'deploy'
Conflicts:
.gitmodules
config/database.yml.orig
https://github.com/marnen/quorum2/commit/bd92d30081f54964f494a89d28...
2 changed files
-
R
.gitmodules -
M
config/deploy-orig.rb