Merge branch 'MDL-69104-master' of https://github.com/HuongNV13/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 8 Jul 2020 05:06:45 +0000 (13:06 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 8 Jul 2020 05:06:45 +0000 (13:06 +0800)

Trivial merge