Merge branch 'MDL-71395-310-2' of git://github.com/marinaglancy/moodle into MOODLE_31...
commitcd83b3732efaddeb87a9fc24c0efa622bb6af20c
authorJun Pataleta <jun@moodle.com>
Fri, 7 May 2021 02:30:39 +0000 (7 10:30 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 7 May 2021 02:30:39 +0000 (7 10:30 +0800)
tree2eba1c5ce9e0e77e5bd07d23d912a1f404f397b2
parentc6ec73b12e0f07b4c10902754fd1b93a3679294a
parentd87d0973f51e927be2ed8c2d4daca75399822bfb
Merge branch 'MDL-71395-310-2' of git://github.com/marinaglancy/moodle into MOODLE_310_STABLE