Merge branch 'MDL-69559-310-7' of git://github.com/mickhawkins/moodle into MOODLE_310...
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 26 Oct 2020 05:05:33 +0000 (13:05 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 26 Oct 2020 05:05:33 +0000 (13:05 +0800)

Trivial merge