|
Merge branch 'development' into issue_431
|
|---|
| app/views/answers/_new_edit.html.erb |
|---|
| app/views/guidances/_add_guidance.html.erb |
|---|
| app/views/guidances/admin_edit.html.erb |
|---|
| app/views/guidances/admin_new.html.erb |
|---|
| app/views/notes/_add.html.erb |
|---|
| app/views/orgs/admin_edit.html.erb |
|---|
| app/views/phases/admin_add.html.erb |
|---|
| app/views/phases/admin_show.html.erb |
|---|
| app/views/plans/edit.html.erb |
|---|
| app/views/templates/admin_new.html.erb |
|---|
| app/views/templates/admin_template.html.erb |
|---|
| config/tinymce.yml |
|---|