Merge branch 'MDL-69308_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Thu, 14 Jan 2021 11:03:52 +0000 (12:03 +0100)
committerSara Arjona <sara@moodle.com>
Thu, 14 Jan 2021 11:03:52 +0000 (12:03 +0100)
commit9fac7a8d5947fed021fe58421cf10de5b9f43d50
treeac82a88b5a0bbde843ed6339c07c0884f6f2fb07
parente1ca7e93d97025bd263d9513ae71f491fe448eb8
parentdb30a623bfb9932fdb6f742f66ea795725364c16
Merge branch 'MDL-69308_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE