Merge branch 'MDL-70387-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 13:56:04 +0000 (14:56 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 13:56:04 +0000 (14:56 +0100)

Trivial merge