Merge branch 'MDL-70426-310' of https://github.com/HuongNV13/moodle into MOODLE_310_S...
authorJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 07:16:41 +0000 (15:16 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 07:16:41 +0000 (15:16 +0800)

Trivial merge