Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
dev
commit 2fbfd9c40675de97fc0a96b667063873450bba28
2 parents d30bdc4 + d215c39
@xsrust xsrust authored on 13 Apr 2017
Showing 10 changed files
View
Gemfile
View
Gemfile.lock
View
app/controllers/plans_controller.rb
View
app/models/exported_plan.rb
View
app/views/phases/_answer_form.html.erb
View
app/views/phases/edit.html.erb
View
app/views/plans/export.docx.erb 0 → 100644
View
app/views/shared/_export_links.html.erb
View
db/migrate/20170412143945_add_phase_id_to_exported_plan.rb 0 → 100644
View
db/schema.rb