Merge branch 'MDL-55808_master' of git://github.com/juancs/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 19 Nov 2017 21:34:55 +0000 (10:34 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 19 Nov 2017 21:34:55 +0000 (10:34 +1300)
commit1508fa23d282c94e7643311f3d58a2f32c222898
treecd0705b0b797103164c7e234761b4bfe33d224b1
parent5f8407d5dab3837dc521506a76ff07d3f0e19956
parentf8c0b9e71fc6fbea05589aa1a2c3aca71e9faca5
Merge branch 'MDL-55808_master' of git://github.com/juancs/moodle
mod/glossary/lib.php