Merge branch 'MDL-70066-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2020 02:00:33 +0000 (10:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2020 02:00:33 +0000 (10:00 +0800)

Trivial merge