Merge branch 'MDL-70535-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE
commita05c39c11791bb19456bfbc65f2714511a1cb139
authorSara Arjona <sara@moodle.com>
Wed, 3 Feb 2021 10:19:26 +0000 (3 11:19 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 3 Feb 2021 10:19:26 +0000 (3 11:19 +0100)
treee8a666ce3121786f0bfe7dfd7ceb285e7303a1c6
parent48174f38b9728a0d0cf2302b681f1efbf4b0698f
parentc9f5e23f9bd02098cd8816470307279bee376995
Merge branch 'MDL-70535-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE