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

Trivial merge