Changeset [011958b81949cf8575815f5bf909a3a99f9d08e2] by Shawn Balestracci
Revision 011958b81949cf8575815f5bf909a3a99f9d08e2,
committed by Shawn Balestracci
· December 30th, 2011 @ 07:15 PM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/011958b81949cf8575815f5bf9...
9 changed files
-
M
.travis.yml -
M
config/environment.rb -
M
config/gems.yml -
M
features/district_admin/district_admin.feature -
M
features/regular_user/sims_demo_walkthrough.feature -
M
lib/tasks/moonshine.rake -
M
lib/use_old_fixtures_key.rb -
M
spec/controllers/reports_controller_spec.rb -
M
vendor/plugins/moonshine/lib/moonshine/manifest/rails/rails.rb