Merge branch 'MDL-71392-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE
commit6a5b32a584d218b67b249b1fe4a12c234acfffad
authorSara Arjona <sara@moodle.com>
Mon, 26 Apr 2021 09:52:54 +0000 (26 11:52 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 26 Apr 2021 09:52:54 +0000 (26 11:52 +0200)
tree0e84dcae1e44d9a3e82375c7c0c296abb5038450
parent2d576c3b417b0cf0c85fe45082b210b74857c4a6
parent1c00938de970cb41b95757a29f2af26e2afd49b1
Merge branch 'MDL-71392-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE