Merge branch 'MDL-69630-master' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 17 Sep 2020 04:50:02 +0000 (12:50 +0800)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 06:43:51 +0000 (08:43 +0200)

Trivial merge