Merge branch 'MDL-65654-master' of https://github.com/danielneis/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 May 2019 01:35:17 +0000 (09:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 May 2019 01:35:17 +0000 (09:35 +0800)

Trivial merge