Merge branch 'MDL-66279-master' of git://git.cameron1729.xyz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Aug 2019 03:48:13 +0000 (11:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Aug 2019 03:48:13 +0000 (11:48 +0800)

Trivial merge