Changeset [74ecc13375b612d1d359274be76009245159ad20] by Shawn Balestracci

January 26th, 2013 @ 06:35 AM

Merge branch 'master' into jquery

Conflicts:
app/helpers/application_helper.rb spec/helpers/flags_helper_spec.rb https://github.com/vegantech/sims/commit/74ecc13375b612d1d359274be7...

Committed by Shawn Balestracci

  • A windows_live.yml
  • M app/helpers/application_helper.rb
  • M app/helpers/flags_helper.rb
  • M app/views/users/sessions/new.html.erb
  • M spec/helpers/flags_helper_spec.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