Merge branch 'MDL-68449-master' of git://github.com/cescobedo/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 12:39:10 +0000 (14:39 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 12:39:10 +0000 (14:39 +0200)

Trivial merge