Changeset [54b9b99c362971b891fe441b2c084c8c592580e9] by Shawn Balestracci
Revision 54b9b99c362971b891fe441b2c084c8c592580e9,
committed by Shawn Balestracci
· October 25th, 2011 @ 02:27 PM
Merge branch 'merge_of_649_and_651' into wip
https://github.com/vegantech/sims/commit/54b9b99c362971b891fe441b2c...
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