Merge branch 'MDL-70772-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE
commit330d34a7146f6eae2a5253db9e79037561ef871e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 May 2021 21:20:03 +0000 (6 23:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 May 2021 21:20:03 +0000 (6 23:20 +0200)
treec4baf1bfad444fb6f5855334e4928583055400c8
parent136e008a139b47bba4378d0fd19e0b9928e73269
parent5a862117fdbce9899070e86698cfea79a9428459
Merge branch 'MDL-70772-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE