Merge branch 'MDL-68782-master' of git://github.com/aanabit/moodle
authorSara Arjona <sara@moodle.com>
Thu, 21 May 2020 06:23:46 +0000 (08:23 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 21 May 2020 06:23:46 +0000 (08:23 +0200)

Trivial merge