Browse code fixed merge conflicts dev
commit d62b6ca1c4306a371834dc1a6d6d670eb938a086 2 parents ba7e8e0 + 6ab65a5 briley authored on 27 Jun 2017

Showing 33 changed files

• CONTRIBUTING.md
• app/controllers/application_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/questions_controller.rb
• app/models/plan.rb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/guidance_groups/admin_new.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/phases/_edit_phase.html.erb
• app/views/phases/admin_add.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/export.docx.erb
• app/views/questions/_add_question.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/sections/_add_section.html.erb
• app/views/sections/_edit_section.html.erb
• app/views/shared/_register_form.html.erb
• app/views/templates/_edit_annotations.html.erb
• app/views/templates/_edit_template.html.erb
• app/views/templates/admin_new.html.erb
• config/locale/app.pot
• config/locale/de/app.po
• config/locale/domain.pot
• config/locale/en_GB/app.po
• config/locale/en_US/app.po
• config/locale/es/app.po
• config/locale/fr/app.po
• config/tinymce.yml
• lib/assets/javascripts/views/shared/register_form.js

Ignore Space Show notes View CONTRIBUTING.md 0 → 100644

Ignore Space Show notes View app/controllers/application_controller.rb

Ignore Space Show notes View app/controllers/guidances_controller.rb

Ignore Space Show notes View app/controllers/phases_controller.rb

Ignore Space Show notes View app/controllers/plans_controller.rb

Ignore Space Show notes View app/controllers/questions_controller.rb

Ignore Space Show notes View app/models/plan.rb

Ignore Space Show notes View app/views/guidance_groups/admin_edit.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_new.html.erb

Ignore Space Show notes View app/views/guidances/_add_guidance.html.erb

Ignore Space Show notes View app/views/guidances/admin_edit.html.erb

Ignore Space Show notes View app/views/guidances/admin_new.html.erb

Ignore Space Show notes View app/views/phases/_edit_phase.html.erb

Ignore Space Show notes View app/views/phases/admin_add.html.erb

Ignore Space Show notes View app/views/plans/_plan_details.html.erb

Ignore Space Show notes View app/views/plans/export.docx.erb

Ignore Space Show notes View app/views/questions/_add_question.html.erb

Ignore Space Show notes View app/views/questions/_edit_question.html.erb

Ignore Space Show notes View app/views/sections/_add_section.html.erb

Ignore Space Show notes View app/views/sections/_edit_section.html.erb

Ignore Space Show notes View app/views/shared/_register_form.html.erb

Ignore Space Show notes View app/views/templates/_edit_annotations.html.erb

Ignore Space Show notes View app/views/templates/_edit_template.html.erb

Ignore Space Show notes View app/views/templates/admin_new.html.erb

Ignore Space Show notes View config/locale/app.pot

Ignore Space Show notes View config/locale/de/app.po

Ignore Space Show notes View config/locale/domain.pot 0 → 100644

Ignore Space Show notes View config/locale/en_GB/app.po

Ignore Space Show notes View config/locale/en_US/app.po

Ignore Space Show notes View config/locale/es/app.po

Ignore Space Show notes View config/locale/fr/app.po

Ignore Space Show notes View config/tinymce.yml

Ignore Space Show notes View lib/assets/javascripts/views/shared/register_form.js

Show line notes below