Merge branch 'master-MDL-70117' of https://github.com/golenkovm/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 12 Nov 2020 03:48:57 +0000 (11:48 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 12 Nov 2020 03:48:57 +0000 (11:48 +0800)

Trivial merge