Changeset [a7bf965dbd7e4066bc0dcf98e08ae655be75f221] by Shawn Balestracci
June 21st, 2012 @ 02:43 PM
Merge branch 'master' into devise
Conflicts:
Gemfile.lock
app/controllers/login_controller.rb
app/models/district_log.rb
app/models/user.rb
spec/helpers/application_helper_spec.rb
spec/models/user_spec.rb
https://github.com/vegantech/sims/commit/a7bf965dbd7e4066bc0dcf98e0...
Committed by Shawn Balestracci
- M Gemfile
- M Gemfile.lock
- M app/controllers/districts_controller.rb
- M app/helpers/application_helper.rb
- M app/models/district_log.rb
- M app/models/user.rb
- M spec/helpers/application_helper_spec.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Student Intervention Monitoring System