|
Merge pull request #1566 from DMPRoadmap/development
Pulling bug fixes into master |
|---|
| Gemfile.lock |
|---|
| app/controllers/org_admin/phases_controller.rb |
|---|
| app/controllers/org_admin/sections_controller.rb |
|---|
| app/controllers/org_admin/templates_controller.rb |
|---|
| app/controllers/users_controller.rb |
|---|
| app/policies/user_policy.rb |
|---|
| app/views/plans/_overview_details.html.erb |
|---|
| app/views/shared/export/_plan_coversheet.erb |
|---|
| test/functional/org_admin/phases_controller_test.rb |
|---|
| test/functional/org_admin/templates_controller_test.rb |
|---|