Merge branch 'MDL-70815-master-6' of git://github.com/junpataleta/moodle
authorSara Arjona <sara@moodle.com>
Tue, 9 Mar 2021 14:18:28 +0000 (15:18 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 9 Mar 2021 14:18:28 +0000 (15:18 +0100)

Trivial merge