Changeset [cbc2a82faddabcaa092ce7c665b3ce92253e149d] by Shawn Balestracci
August 25th, 2012 @ 04:24 PM
Merge branch 'master' into ruby_1.9.3
Conflicts:
app/metal/session_check.rb
https://github.com/vegantech/sims/commit/cbc2a82faddabcaa092ce7c665...
Committed by Shawn Balestracci
- A app/controllers/chart_proxy_app.rb
- A app/controllers/session_check_app.rb
- A spec/controllers/chart_proxy_app_spec.rb
- A spec/controllers/session_check_app_spec.rb
- R app/metal/chart_proxy.rb
- R app/metal/session_check.rb
- R spec/metal/session_check_spec.rb
- M config/application.rb
- M config/deploy/veg_open.rb
- M config/routes.rb
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