Merge branch 'MDL-70769-master' of https://github.com/sharidas/moodle
authorVíctor Déniz <victor@moodle.com>
Thu, 8 Apr 2021 23:54:18 +0000 (00:54 +0100)
committerVíctor Déniz <victor@moodle.com>
Thu, 8 Apr 2021 23:54:18 +0000 (00:54 +0100)

Trivial merge