Merge branch 'MDL-70979-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE
commitf65de8edfb03cd3c2c72441fd0460f2013e09088
authorSara Arjona <sara@moodle.com>
Wed, 28 Apr 2021 11:06:12 +0000 (28 13:06 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 28 Apr 2021 11:06:12 +0000 (28 13:06 +0200)
treed34f583db13f6d1b710ff45ebe545e2b2834d33b
parentc70efcb7ec4a6b1fbaafd9ffc69c3f30e02e80b9
parentf0db65600276ca489bdad731f17b3d4bd14e06c7
Merge branch 'MDL-70979-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE