Changeset [31bd7fb118f55f011cb137a0003989b4d33cb77a] by Shawn Balestracci
Revision 31bd7fb118f55f011cb137a0003989b4d33cb77a,
committed by Shawn Balestracci
· February 27th, 2011 @ 08:30 PM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/31bd7fb118f55f011cb137a000...
8 changed files
-
M
app/models/school.rb -
M
app/models/user.rb -
M
app/models/user_school_assignment.rb -
M
config/initializers/fix_validations.rb -
M
lib/csv_importer/base.rb -
M
spec/models/group_spec.rb -
M
spec/models/school_spec.rb -
M
spec/models/user_spec.rb