Merge branch 'MDL-58642-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 19 Apr 2017 08:20:21 +0000 (16:20 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 19 Apr 2017 08:20:21 +0000 (16:20 +0800)
commitf03d9b1946c3461b88425d69edd2f443c1f5ee43
tree2bd0086ec8767bbe4956db116899a965baeb161b
parentfedb00d4bb1221a8a880d87bd3ce0cbacf02dec6
parent5252d2835f6d10bb89461fa1d592647306f85603
Merge branch 'MDL-58642-master' of git://github.com/lameze/moodle
mod/glossary/lib.php