fixed bugs introduced into templates by merge
dev
1 parent c26df63 commit 10711489bb37a709230dda3a36b7a50b075883c9
@xsrust xsrust authored on 3 Feb 2017
Showing 6 changed files
View
app/controllers/templates_controller.rb
View
app/views/dmptemplates/_add_question.html.erb 100644 → 0
View
app/views/dmptemplates/_admin_nav_tabs.html.erb 100644 → 0
View
app/views/templates/_admin_nav_tabs.html.erb
View
app/views/templates/_show_phases_sections.html.erb
View
app/views/templates/admin_index.html.erb