Changeset [9698ce650d055652c8540b63be053a221418c193] by Shawn Balestracci
Revision 9698ce650d055652c8540b63be053a221418c193,
committed by Shawn Balestracci
· September 4th, 2012 @ 08:52 PM
Merge branch 'master' into ruby_1.9.3
Conflicts:
vendor/plugins/moonshine/lib/moonshine/capistrano_integration.rb
https://github.com/vegantech/sims/commit/9698ce650d055652c8540b63be...
6 changed files
-
M
config/deploy/staging.rb -
M
config/moonshine.yml -
M
config/moonshine/production.yml -
M
config/moonshine/staging.yml -
M
lib/csv_importer/all_students_in_schools.rb -
M
vendor/plugins/moonshine/lib/moonshine/capistrano_integration.rb