Merge branch 'MDL-66732' of https://github.com/paulholden/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 30 Apr 2020 09:16:16 +0000 (17:16 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 30 Apr 2020 09:16:16 +0000 (17:16 +0800)
1  2 
config-dist.php
lib/moodlelib.php

diff --cc config-dist.php
Simple merge
Simple merge