Changeset [f20c16c0af7e7efcc9df0024e44afc075b6e17a1] by Shawn Balestracci

July 2nd, 2012 @ 10:42 AM

Merge branch 'master' into devise

Conflicts:

app/models/district.rb

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

Committed by Shawn Balestracci

  • A db/migrate/20120626014700_add_settings_to_districts.rb
  • A db/migrate/20120626021737_switch_district_fields_to_settings.rb
  • M app/models/district.rb
  • M app/models/intervention_definition.rb
  • M db/schema.rb
  • M lib/populate_intervention_dropdowns.rb
  • M spec/lib/populate_intervention_dropdowns_spec.rb
  • M spec/models/district_spec.rb
  • M spec/models/intervention_definition_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