Merge branch 'MDL-53697-master' of git://github.com/abgreeve/moodle
commitaffd85ce24077eff34e4a90f61554a29a96478d6
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 03:36:44 +0000 (17 11:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 03:36:44 +0000 (17 11:36 +0800)
treea75af0c4c3659147213ca8af188354d25d64a022
parent38036e73c22fe8fad5b3fb4144d8b5c025fdfbe4
parent4bebed4011052a1c878ba36a2e10202329585d12
Merge branch 'MDL-53697-master' of git://github.com/abgreeve/moodle
lib/moodlelib.php