Merge branch 'MDL-69008-master' of git://github.com/junpataleta/moodle
authorSara Arjona <sara@moodle.com>
Fri, 19 Jun 2020 14:44:53 +0000 (16:44 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 19 Jun 2020 14:44:53 +0000 (16:44 +0200)

Trivial merge