Merge branch 'MDL-50955-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 17 Nov 2020 05:04:57 +0000 (13:04 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 17 Nov 2020 05:04:57 +0000 (13:04 +0800)

Trivial merge