Merge pull request #1115 from DigitalCurationCentre/issue761
Issue 794 and 761
dev
commit 02396e473b96a0822e37c93b33109874aa981bf6
2 parents 3eb6ba3 + cf10da6
@Bhavi Bhavi authored on 1 Feb 2018
GitHub committed on 1 Feb 2018
Showing 4 changed files
View
app/controllers/paginable/users_controller.rb
View
app/controllers/users_controller.rb
View
app/views/paginable/users/_index.html.erb
View
app/views/users/_admin_grant_permissions.html.erb