Merge branch 'MDL-62945-master' of https://github.com/HuongNV13/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 00:08:18 +0000 (08:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 00:08:18 +0000 (08:08 +0800)

Trivial merge