Merge branch 'master-MDL-67636' of https://github.com/yao9394/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 19 Nov 2020 03:59:32 +0000 (11:59 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 19 Nov 2020 03:59:32 +0000 (11:59 +0800)

Trivial merge