Changeset [7e94871b202342caca0fa508c497ae6c65e7563b] by Shawn Balestracci
Revision 7e94871b202342caca0fa508c497ae6c65e7563b,
committed by Shawn Balestracci
· August 30th, 2014 @ 05:10 PM
Merge branch 'rm_production'
Conflicts:
app/controllers/application_controller.rb
https://github.com/vegantech/sims/commit/7e94871b202342caca0fa508c4...
8 changed files
-
M
app/controllers/application_controller.rb -
M
app/models/district.rb -
M
app/models/student_search.rb -
M
features/regular_user/grade_search.feature -
M
features/regular_user/year_search.feature -
M
features/step_definitions/search_steps.rb -
M
spec/controllers/application_controller_spec.rb -
M
spec/models/student_search_spec.rb