Merge branch 'MDL-62018-master' of git://github.com/sarjona/moodle
commit99775a9f226f7fade0445be32472d1b24c41ad0a
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Apr 2018 15:20:22 +0000 (18 17:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 16:23:32 +0000 (18 18:23 +0200)
tree92c0af999067f1beaf518aacca8204b886177675
parentba5b59c0af3d12d4415d8589c1df7ec92f08ea8e
Merge branch 'MDL-62018-master' of git://github.com/sarjona/moodle
admin/tool/cohortroles/classes/output/cohort_role_assignments_table.php
admin/tool/cohortroles/templates/cohort-in-list.mustache