Merge branch 'MDL-60441_master' of git://github.com/juancs/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:55:23 +0000 (00:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:55:23 +0000 (00:55 +0100)
commit9d51d8e81fbbf36936e5a9334a9a14cb07145598
treeda2b7e93194bb1ba63d135e36603839615b6546d
parent2b6fa076278fcd6ccecce55fb1e16ff4d6dbcf67
parent6e4e60ef9ff06a7f9cc3547a487b31743317bd44
Merge branch 'MDL-60441_master' of git://github.com/juancs/moodle
mod/glossary/lib.php