Merge branch 'MDL-68802-master' of https://github.com/HuongNV13/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 29 May 2020 02:53:57 +0000 (10:53 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 29 May 2020 02:53:57 +0000 (10:53 +0800)

Trivial merge