Merge pull request #40 from DMPRoadmap/development
Rebasing
dev
commit fa603a29e512962d04d6595677bc532410d7a75c
2 parents bb7a834 + b2504dd
@Brian Riley Brian Riley authored on 24 Mar 2017
GitHub committed on 24 Mar 2017
Showing 9 changed files
View
Gemfile.lock
View
app/controllers/phases_controller.rb
View
app/controllers/sections_controller.rb
View
app/controllers/templates_controller.rb
View
app/views/phases/admin_add.html.erb
View
app/views/phases/admin_preview.html.erb
View
app/views/sections/_show_section.html.erb
View
app/views/templates/_admin_nav_tabs.html.erb
View
app/views/templates/admin_template.html.erb