Merge branch 'wip-MDL-57456-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 19 Apr 2017 07:42:29 +0000 (15:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 19 Apr 2017 07:42:29 +0000 (15:42 +0800)
commitc2118c8902bfd94a12a6fbfeaf0e0df3d734beab
treed8685868937662e82951922f051ce30ff58d4789
parent07e5b34c955637c72793a6a26373de83f33e045d
parentc4b8e6112861773658f33fe1c77a17c47dde3dbb
Merge branch 'wip-MDL-57456-master' of git://github.com/marinaglancy/moodle
mod/glossary/lang/en/glossary.php
mod/glossary/lib.php
mod/glossary/tests/lib_test.php