Browse code Merge pull request #55 from DMPRoadmap/development Rebase with latest bug fixes from DCC dev
commit 3f531ca56544bf6b12da6a9c475401e2216fbca9 2 parents a07d3dc + 2a525bc Brian Riley authored on 9 Jun 2017 GitHub committed on 9 Jun 2017

Showing 11 changed files

• app/controllers/templates_controller.rb
• app/models/template.rb
• app/policies/template_policy.rb
• app/views/templates/admin_index.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
• config/routes.rb

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

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

Ignore Space Show notes View app/policies/template_policy.rb

Ignore Space Show notes View app/views/templates/admin_index.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

Ignore Space Show notes View config/routes.rb

Show line notes below