Merge branch 'MDL-68465-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2020 03:29:10 +0000 (11:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2020 03:29:10 +0000 (11:29 +0800)

Trivial merge