Merge branch 'MDL-69044_39' of https://github.com/stronk7/moodle into MOODLE_39_STABLE
authorVíctor Déniz Falcón <victor@moodle.com>
Mon, 15 Jun 2020 16:36:32 +0000 (17:36 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Mon, 15 Jun 2020 16:36:32 +0000 (17:36 +0100)

Trivial merge