Merge branch 'MDL-68578-master' of git://github.com/aanabit/moodle
authorVictor Deniz Falcon <victor@moodle.com>
Tue, 2 Jun 2020 23:35:10 +0000 (00:35 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Tue, 2 Jun 2020 23:35:10 +0000 (00:35 +0100)

Trivial merge