Merge branch 'MDL-70181_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
commitc6ec73b12e0f07b4c10902754fd1b93a3679294a
authorabgreeve <adrian@moodle.com>
Fri, 7 May 2021 02:22:28 +0000 (7 10:22 +0800)
committerabgreeve <adrian@moodle.com>
Fri, 7 May 2021 02:22:28 +0000 (7 10:22 +0800)
tree4a9ed0ce3ae012d193b673206dd37f4c4b7ae9c1
parent3c23c7850028f055882ac3d1fa0d550ca01b7e8d
parent01aee79df01edadab5dd4047ecc3500cb5988cc0
Merge branch 'MDL-70181_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE