Merge branch 'master-MDL-69752' of https://github.com/golenkovm/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Oct 2020 08:54:45 +0000 (10:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Oct 2020 08:54:45 +0000 (10:54 +0200)

Trivial merge