Changeset [9cccf0f0a70a280b4e9069131b6888f638e6b35f] by Marnen Laibow-Koser
Revision 9cccf0f0a70a280b4e9069131b6888f638e6b35f,
committed by Marnen Laibow-Koser
· September 2nd, 2011 @ 02:46 AM
Merge branch 'rails_upgrade' into 52-rails3
Conflicts:
config/routes.rb
https://github.com/marnen/quorum2/commit/9cccf0f0a70a280b4e9069131b...
1 changed file
-
M
config/routes.rb