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. |
---|
app/models/plan.rb |
---|
app/views/settings/phases/._export_formatting_form.html.erb.swp 100644 → 0 |
---|
Not supported
|
lib/assets/javascripts/plans.js |
---|