Changeset [309b9e201dfc2c67e4ef166ae1dbc36914831c79] by Shawn Balestracci
Revision 309b9e201dfc2c67e4ef166ae1dbc36914831c79,
committed by Shawn Balestracci
· March 5th, 2014 @ 10:58 PM
Merge branch 'rm_production'
Conflicts:
Gemfile.lock
https://github.com/vegantech/sims/commit/309b9e201dfc2c67e4ef166ae1...
2 changed files
-
M
Gemfile.lock -
M
app/models/district.rb