Changeset [4b119d0951d4434525442a8c9645f39d85db92af] by Shawn Balestracci
Revision 4b119d0951d4434525442a8c9645f39d85db92af,
committed by Shawn Balestracci
· March 25th, 2010 @ 10:20 AM
Merge branch 'master' into 271_group_progress_monitor_entry
http://github.com/vegantech/sims/commit/4b119d0951d4434525442a8c964...
14 changed files
-
A
app/views/consultation_forms/_edit.html.erb -
A
app/views/consultation_forms/edit.html.erb -
A
app/views/consultation_forms/edit.js.rjs -
A
app/views/consultation_forms/update.js.rjs -
M
app/controllers/consultation_forms_controller.rb -
M
app/manifests/application_manifest.rb -
M
app/views/consultation_forms/_consultation_form_summary.html.erb -
M
app/views/consultation_forms/_list.html.erb -
M
app/views/team_consultations/_complete.html.erb -
M
app/views/team_consultations/_list.html.erb -
M
app/views/team_consultations/_show.html.erb -
M
app/views/team_consultations/_team_consultation.html.erb -
M
features/district_admin/district_students_admin.feature -
M
public/stylesheets/common.css