Merge branch 'master_MDL-68223' of https://github.com/golenkovm/moodle
authorSara Arjona <sara@moodle.com>
Tue, 7 Apr 2020 11:42:20 +0000 (13:42 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 7 Apr 2020 11:42:20 +0000 (13:42 +0200)

Trivial merge