Merge branch 'MDL-70905-master' of https://github.com/kabalin/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 May 2021 20:41:28 +0000 (22:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 May 2021 20:41:28 +0000 (22:41 +0200)

Trivial merge