Merge branch 'MDL-69269-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 04:10:44 +0000 (12:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 23:26:01 +0000 (07:26 +0800)

Trivial merge