Merge branch 'MDL-65933-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Aug 2019 03:41:50 +0000 (11:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Aug 2019 03:41:50 +0000 (11:41 +0800)

Trivial merge