Changeset [36bc5829f776f9d5f80bb1ddc1c8ca0b4e80bf26] by Shawn Balestracci
Revision 36bc5829f776f9d5f80bb1ddc1c8ca0b4e80bf26,
committed by Shawn Balestracci
· October 25th, 2011 @ 02:26 PM
[#649 #651] resolve merge conflicts https://github.com/vegantech/sims/commit/36bc5829f776f9d5f80bb1ddc1...
12 changed files
-
M
app/controllers/application_controller.rb -
M
app/controllers/district/schools_controller.rb -
M
app/controllers/district/students_controller.rb -
M
app/controllers/district/users_controller.rb -
M
app/controllers/groups_controller.rb -
M
app/controllers/school_teams_controller.rb -
M
app/models/group.rb -
M
spec/controllers/district/schools_controller_spec.rb -
M
spec/controllers/district/students_controller_spec.rb -
M
spec/controllers/district/users_controller_spec.rb -
M
spec/controllers/groups_controller_spec.rb -
M
spec/controllers/school_teams_controller_spec.rb