Changeset [24799cb6f7edfcf19ddea36f0c561c877fbf6351] by Shawn Balestracci
Revision 24799cb6f7edfcf19ddea36f0c561c877fbf6351,
committed by Shawn Balestracci
· January 3rd, 2012 @ 11:49 AM
Merge branch 'master' into checklist_cucumber_feature
https://github.com/vegantech/sims/commit/24799cb6f7edfcf19ddea36f0c...
10 changed files
-
M
app/controllers/application_controller.rb -
M
app/controllers/login_controller.rb -
M
app/models/user.rb -
M
app/views/principal_overrides/create.js.rjs -
M
app/views/principal_overrides/destroy.js.rjs -
M
app/views/principal_overrides/undo.js.rjs -
M
app/views/principal_overrides/update.js.rjs -
M
app/views/reports/student_overall.html.erb -
M
app/views/student_comments/_comment.html.erb -
M
lib/tasks/verify_rcov.rake