Merge branch 'MDL-60621-master-1' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 30 Jun 2020 04:30:48 +0000 (12:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 30 Jun 2020 04:30:48 +0000 (12:30 +0800)

Trivial merge