Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
dev
commit 02ec675f360cbdb2599d4eba6e3aeb5edd53b07f
2 parents 71345bd + 86d6b19
@ray.carrick ray.carrick authored on 5 Apr 2017
Showing 9 changed files
View
app/controllers/plans_controller.rb
View
app/controllers/roles_controller.rb
View
app/models/exported_plan.rb
View
app/models/role.rb
View
app/views/plans/export.docx.caracal
View
app/views/plans/export.pdf.erb
View
app/views/plans/share.html.erb
View
app/views/user_mailer/permissions_change_notification.html.erb
View
config/locale/app.pot