Merge branch 'MDL-65928-master-2' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jul 2019 23:18:17 +0000 (07:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jul 2019 23:18:17 +0000 (07:18 +0800)

Trivial merge