Merge branch 'final_schema' into development
Fixes DMPRoadmap/roadmap#103 wree done in local final_schema
branch befoe development was created from final_schema
so this merge final_schema into development.
dev
commit a43aaa884e913e5ec7c75f8ffa577b9c35b7280d
2 parents 2e4554a + 6057746
@Ray Carrick Ray Carrick authored on 22 Feb 2017
Showing 3 changed files
View
app/models/plan.rb
View
app/views/settings/phases/._export_formatting_form.html.erb.swp 100644 → 0
Not supported
View
lib/assets/javascripts/plans.js