Merge branch 'MDL-68052' of git://github.com/danmarsden/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 30 Nov 2020 01:39:51 +0000 (09:39 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 30 Nov 2020 01:39:51 +0000 (09:39 +0800)

Trivial merge