Merge branch 'MDL-68617-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Wed, 20 May 2020 14:32:36 +0000 (16:32 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 20 May 2020 14:32:36 +0000 (16:32 +0200)

Trivial merge