Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)
commitbdb157653b8e93a81169e198e62b295f5b02343d
tree2b53a5ad0550a3fe86cc3104a37bd0c12125b63a
parent49cbe666a4a3cc11a6c74349a6dc425b2af11a0d
parenta938e4096c6ea0021eecc6eca6997f1d3437532e
Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle
group/lib.php
mod/glossary/lib.php