Merge branch 'MDL-69115-master' of git://github.com/junpataleta/moodle
authorSara Arjona <sara@moodle.com>
Mon, 13 Jul 2020 12:24:00 +0000 (14:24 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 13 Jul 2020 12:24:00 +0000 (14:24 +0200)

Trivial merge