Merge branch 'MDL-70248-310' of https://github.com/HuongNV13/moodle into MOODLE_310_S...
authorSara Arjona <sara@moodle.com>
Wed, 25 Nov 2020 15:22:59 +0000 (16:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:54:25 +0000 (12:54 +0100)

Trivial merge