Merge branch 'MDL-69095-39' of git://github.com/jleyva/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 22:19:51 +0000 (00:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 22:19:51 +0000 (00:19 +0200)

Trivial merge