Merge branch 'MDL-69110-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Jul 2020 05:16:38 +0000 (13:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Jul 2020 05:16:38 +0000 (13:16 +0800)

Trivial merge