Merge branch 'MDL-67668-310-2' of git://github.com/andrewnicols/moodle into MOODLE_31...
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 23 Nov 2020 07:37:44 +0000 (15:37 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 23 Nov 2020 07:37:44 +0000 (15:37 +0800)

Trivial merge