Changeset [9b5a5ae68ff56a24c53def13dbaf88e15335f8b1] by Brian Michalski
Revision 9b5a5ae68ff56a24c53def13dbaf88e15335f8b1,
committed by Brian Michalski
· July 18th, 2012 @ 01:04 AM
Merge branch 'master' of github.com:concerto/concerto
Conflicts:
config/application.rb
https://github.com/concerto/concerto/commit/9b5a5ae68ff56a24c53def1...
1 changed file
-
M
config/application.rb