Merge branch 'MDL-71039-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Mar 2021 03:17:44 +0000 (11:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Mar 2021 03:17:44 +0000 (11:17 +0800)

Trivial merge