Merge branch 'MDL-70394-master' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 14:31:11 +0000 (15:31 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 14:31:11 +0000 (15:31 +0100)
commit8717e879164ef366e8669318eb4735893ac330bb
tree59f7a7baf1df4f9e5aea60043bb244eb12d934dd
parent58eaf86573601e3d6145abca46cf083a6493a161
parent0dc19291b936484eb19583642da17d1ebec2c2c2
Merge branch 'MDL-70394-master' of git://github.com/rezaies/moodle