Merge branch 'MDL-69608-39' of https://github.com/marinaglancy/moodle into MOODLE_39_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2020 21:50:09 +0000 (23:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2020 21:50:09 +0000 (23:50 +0200)

Trivial merge