Merge branch 'MDL-70578-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE
commit6c330f2f76299c4c7e09bcfc720c1ead4f5d40a8
authorSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 11:58:11 +0000 (11 12:58 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 11:58:11 +0000 (11 12:58 +0100)
treeccfe851bf35d8b1dd127dd35fd451c0f5ef1347d
parent0c3ae37c2ca21df00ce1a6431d77edfb491cf7ca
parent1fc4efa8343ac16dc85410649e91e885f67294f9
Merge branch 'MDL-70578-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE