Merge branch 'master_MDL-71254' of https://github.com/golenkovm/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Apr 2021 00:18:39 +0000 (08:18 +0800)
committerVíctor Déniz <victor@moodle.com>
Fri, 16 Apr 2021 06:57:01 +0000 (07:57 +0100)

Trivial merge