Merge branch 'MDL-70476_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jan 2021 23:28:08 +0000 (00:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jan 2021 23:28:08 +0000 (00:28 +0100)
commit8d306e640f8201fb240046c8a9401da1735f93e1
treec9e353d808e2d83bdd15f26abbecc936abc80bb6
parent17d296f1eadaf426576d7f40cfb7a42593c411c1
parentccfc9f7bc9d3a8f9d6874610957b7265ce7c896f
Merge branch 'MDL-70476_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE