Browse code Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes dev
commit 5f3d83f7271b31b16a0bf9c754186a74668703c8 2 parents c2ba750 + a48d50b xsrust authored on 6 Jun 2017

Showing 11 changed files

• app/models/phase.rb
• app/models/question.rb
• app/models/user.rb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/guidance_groups/admin_new.html.erb
• config/locale/app.pot
• config/locale/de/app.po
• config/locale/en_GB/app.po
• config/locale/en_US/app.po
• config/locale/es/app.po
• config/locale/fr/app.po

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

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

Ignore Space Show notes View app/models/user.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 config/locale/app.pot

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

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

Show line notes below