Merge branch 'MDL-57614-master-4' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Dec 2020 07:09:52 +0000 (15:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Dec 2020 07:09:52 +0000 (15:09 +0800)

Trivial merge