Changeset [d87bbb4cdd79e249044ca31d50155d56cf560d75] by Shawn Balestracci

November 9th, 2012 @ 12:50 PM

Merge branch 'master' into ruby_1.9.3

Conflicts:

app/controllers/application_controller.rb

https://github.com/vegantech/sims/commit/d87bbb4cdd79e249044ca31d50...

Committed by Shawn Balestracci

  • M app/controllers/application_controller.rb
  • M app/controllers/help_controller.rb
  • M app/controllers/stats_controller.rb
  • M app/controllers/users/sessions_controller.rb
  • M spec/controllers/application_controller_spec.rb
  • M spec/support/shared_contexts.rb
New-ticket 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

Shared Ticket Bins