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)
1  2 
lang/en/admin.php
lib/moodlelib.php

Simple merge
Simple merge