Merge branch 'MDL-70386-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2020 17:21:02 +0000 (18:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2020 17:21:02 +0000 (18:21 +0100)

Trivial merge