Merge branch 'MDL-69759-master' of https://github.com/sammarshallou/moodle
authorVíctor Déniz <victor@moodle.com>
Wed, 7 Oct 2020 21:24:38 +0000 (22:24 +0100)
committerVíctor Déniz <victor@moodle.com>
Wed, 7 Oct 2020 21:24:38 +0000 (22:24 +0100)

Trivial merge