Merge branch 'MDL-69874-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE
commit2c13de9fc8674adc5e4b6805dd85b767a59fdefa
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Apr 2021 21:08:57 +0000 (13 23:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Apr 2021 21:08:57 +0000 (13 23:08 +0200)
tree976054fbb54e1f273f18e07607b060f5215829ac
parent1f2fbfe331f4b01d3ffa56c5827d42981b986a3a
parent4a67d78a4cff299095a0f1377e1819ce13391042
Merge branch 'MDL-69874-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE