Merge branch 'MDL-70004-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 28 Oct 2020 05:10:14 +0000 (13:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 28 Oct 2020 05:10:14 +0000 (13:10 +0800)

Trivial merge