Merge branch 'master-MDL-69818' of https://github.com/golenkovm/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 12 Oct 2020 06:49:40 +0000 (14:49 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 12 Oct 2020 06:49:40 +0000 (14:49 +0800)

Trivial merge