Merge branch 'MDL-69266-310' of https://github.com/HuongNV13/moodle into MOODLE_310_S...
authorJun Pataleta <jun@moodle.com>
Fri, 16 Oct 2020 02:09:40 +0000 (10:09 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 16 Oct 2020 02:09:40 +0000 (10:09 +0800)

Trivial merge