Changeset [b6eb7f130555c927671b18088db07872c13905d9] by Shawn Balestracci
Revision b6eb7f130555c927671b18088db07872c13905d9,
committed by Shawn Balestracci
· October 31st, 2012 @ 05:48 PM
Merge branch 'master' into ruby_1.9.3
Conflicts:
Gemfile.lock
https://github.com/vegantech/sims/commit/b6eb7f130555c927671b18088d...
4 changed files
-
M
Gemfile.lock -
M
app/models/student.rb -
M
spec/factories.rb -
M
spec/models/student_spec.rb