Merge branch 'MDL-70340-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Mar 2021 22:32:30 +0000 (23:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Mar 2021 22:32:30 +0000 (23:32 +0100)

Trivial merge