Merge branch 'MDL-67434-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Dec 2019 09:28:49 +0000 (17:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Dec 2019 09:28:49 +0000 (17:28 +0800)

Trivial merge