Merge branch 'MDL-70034_310' of git://github.com/mdjnelson/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 14:19:32 +0000 (15:19 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 14:19:32 +0000 (15:19 +0100)
commit77d7480096d6e8e003dd854e39c502c30d7543b1
tree055599bf3a63dcec375ca7c2e99c218e4eaa9ddb
parentb57b9b41cd5715cd4cf4dd485c1323c1c8d04ca9
parent2ab950039c6fa61368df8e4bd98fd98bc5176faa
Merge branch 'MDL-70034_310' of git://github.com/mdjnelson/moodle into MOODLE_310_STABLE