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

Trivial merge