Changeset [e1779cd809dc0222e8f6863032b7a2940d88adb6] by Shawn Balestracci

January 25th, 2013 @ 08:22 PM

Merge branch 'master' into jquery

Conflicts:
app/views/students/_team_consultations.html.erb https://github.com/vegantech/sims/commit/e1779cd809dc0222e8f6863032...

Committed by Shawn Balestracci

  • M app/helpers/flags_helper.rb
  • M app/models/district.rb
  • M app/models/team_consultation.rb
  • M app/views/districts/edit.html.erb
  • M app/views/login/_whats_new.html.erb
  • M app/views/students/_team_consultations.html.erb
  • M config/initializers/host_info.rb
  • M features/regular_user/concern_note.feature
  • M features/step_definitions/concerns_steps.rb
  • M features/support/paths.rb
  • M spec/helpers/flags_helper_spec.rb
  • M spec/models/team_consultation_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