Merge branch 'master-MDL-69791' of https://github.com/golenkovm/moodle into master
authorSara Arjona <sara@moodle.com>
Mon, 19 Oct 2020 08:07:11 +0000 (10:07 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 19 Oct 2020 08:07:11 +0000 (10:07 +0200)

Trivial merge