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