Merge branch 'MDL-63805-master' of git://github.com/jleyva/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Oct 2020 19:22:02 +0000 (21:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Oct 2020 19:22:02 +0000 (21:22 +0200)

Trivial merge