Merge branch 'MDL-70963-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE
commitd24a83f5e74af104593fd1456e10f31b022103c0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Mar 2021 10:39:49 +0000 (29 12:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Mar 2021 10:39:49 +0000 (29 12:39 +0200)
tree9193c5339184e17b3400ec4be7429854249f0125
parentd940eabc2cca64787a88c3cdae9bbd965268d421
parentc2c04214bb6de07e1fe8cac213e3c6da64a80c5a
Merge branch 'MDL-70963-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE