Merge branch 'MDL-57682-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2020 04:22:54 +0000 (12:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2020 04:22:54 +0000 (12:22 +0800)

Trivial merge