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