Merge branch 'MDL-48362-master' of git://github.com/damyon/moodle

moodle · Feb 29, 2016 · dfc1884 · dfc1884
2 parents 90a11c2 + f758951
commit dfc1884
Show file tree

Hide file tree

Showing 28 changed files with 1,602 additions and 1,863 deletions.
diff --git a/enrol/cohort/edit.php b/enrol/cohort/edit.php
diff --git a/enrol/cohort/edit_form.php b/enrol/cohort/edit_form.php