Merge branch 'MDL-69054-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:28:19 +0000 (07:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:28:19 +0000 (07:28 +0800)

Trivial merge