Changeset [2e0d2a96329cf0da91ab16b51e30ec97294f5853] by Shawn Balestracci
Revision 2e0d2a96329cf0da91ab16b51e30ec97294f5853,
committed by Shawn Balestracci
· September 1st, 2012 @ 07:39 PM
Merge branch 'master' into ruby_1.9.3
Conflicts:
Gemfile.lock
https://github.com/vegantech/sims/commit/2e0d2a96329cf0da91ab16b51e...
3 changed files
-
M
Gemfile -
M
Gemfile.lock -
M
config/deploy/prohibition.rb