Merge branch 'MDL-69477' of https://github.com/stronk7/moodle
authorVictor Deniz Falcon <victor@moodle.com>
Tue, 18 Aug 2020 12:03:40 +0000 (13:03 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Tue, 18 Aug 2020 12:03:40 +0000 (13:03 +0100)

Trivial merge