Merge branch 'MDL-68379-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Mon, 4 May 2020 18:02:06 +0000 (20:02 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 4 May 2020 18:02:06 +0000 (20:02 +0200)

Trivial merge