Merge branch 'MDL-69301-master' of git://github.com/rezaies/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 7 Dec 2020 02:05:55 +0000 (10:05 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 7 Dec 2020 02:05:55 +0000 (10:05 +0800)

Trivial merge