Merge branch 'development' into issue_431
dev
commit a7680723760882b3c2df7f54647f0acb5d3ba59a
2 parents 59e0c6d + 8e1511e
@Jose Lloret Jose Lloret authored on 20 Jun 2017
Showing 12 changed files
View
app/views/answers/_new_edit.html.erb
View
app/views/guidances/_add_guidance.html.erb
View
app/views/guidances/admin_edit.html.erb
View
app/views/guidances/admin_new.html.erb
View
app/views/notes/_add.html.erb
View
app/views/orgs/admin_edit.html.erb
View
app/views/phases/admin_add.html.erb
View
app/views/phases/admin_show.html.erb
View
app/views/plans/edit.html.erb
View
app/views/templates/admin_new.html.erb
View
app/views/templates/admin_template.html.erb
View
config/tinymce.yml