Changeset [9b7d17f25632a72dfdf8edce0ac5c242ab9ce676] by Shawn Balestracci
Revision 9b7d17f25632a72dfdf8edce0ac5c242ab9ce676,
committed by Shawn Balestracci
· January 18th, 2012 @ 01:24 AM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/9b7d17f25632a72dfdf8edce0a...
14 changed files
-
R
vendor/plugins/coveralls/install.rb -
R
vendor/plugins/coveralls/uninstall.rb -
M
app/controllers/doc_controller.rb -
M
app/models/notifications.rb -
M
app/models/personal_group.rb -
M
app/models/user.rb -
M
config/initializers/use_old_hash_for_fixture_identity.rb -
M
features/step_definitions/file_import.rb -
M
lib/import_csv.rb -
M
spec/lib/automated_intervention_spec.rb -
M
spec/models/district_spec.rb -
M
spec/models/user_spec.rb -
M
vendor/plugins/coveralls/README -
M
vendor/plugins/coveralls/lib/coveralls.rb