Merge branch 'MDL-29895' of https://github.com/enovation/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 22:29:16 +0000 (00:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 22:29:16 +0000 (00:29 +0200)
1  2 
admin/roles/manage.php

Simple merge