Merge branch 'MDL-69074-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jul 2020 17:04:27 +0000 (19:04 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 16 Jul 2020 14:21:27 +0000 (16:21 +0200)

Trivial merge