Changeset [586eae92bdbdb0549b713daa0b0e6e473e67d09d] by Shawn Balestracci
Revision 586eae92bdbdb0549b713daa0b0e6e473e67d09d,
committed by Shawn Balestracci
· October 7th, 2011 @ 12:08 PM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/586eae92bdbdb0549b713daa0b...
3 changed files
-
M
app/models/role.rb -
M
app/models/user.rb -
M
spec/models/user_spec.rb