Changeset [d971604dcd976db993959c623fe97c482987e58c] by Shawn Balestracci
Revision d971604dcd976db993959c623fe97c482987e58c,
committed by Shawn Balestracci
· July 19th, 2012 @ 03:37 PM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/d971604dcd976db993959c623f...
10 changed files
-
M
app/helpers/application_helper.rb -
M
app/helpers/interventions_helper.rb -
M
app/models/district.rb -
M
app/models/user.rb -
M
app/views/districts/edit.html.erb -
M
app/views/login/_whats_new.html.erb -
M
app/views/students/_interventions.html.erb -
M
features/district_admin/district_admin.feature -
M
spec/helpers/interventions_helper_spec.rb -
M
spec/models/user_spec.rb