Merge branch 'MDL-69663-master' of https://github.com/sammarshallou/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 16 Sep 2020 14:17:57 +0000 (22:17 +0800)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 06:43:51 +0000 (08:43 +0200)

Trivial merge