Merge branch 'MDL-65236-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 1 May 2019 06:23:16 +0000 (14:23 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 1 May 2019 06:23:16 +0000 (14:23 +0800)
commit1ba1bb79e821ada5c7e55716f31b613b9a31e847
tree1dda5ffebcb62f2120dfa6b8a30ac1235ed45a49
parent6120920c2ce39487e537fa787d70677b4a1e583f
parent41653114b588c30780a0b04f65df5d496cdecfd2
Merge branch 'MDL-65236-master' of git://github.com/marinaglancy/moodle
lang/en/admin.php
lib/moodlelib.php