Merge branch 'MDL-70373_311' of https://github.com/timhunt/moodle into MOODLE_311_STABLE
commitbb08b03b4f38fa24c25624a757a1bc009d960233
authorSara Arjona <sara@moodle.com>
Wed, 16 Dec 2020 11:40:42 +0000 (16 12:40 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 16 Dec 2020 11:40:42 +0000 (16 12:40 +0100)
tree84cd0e94512fd1d60ad6ad371be0ddbd406b3ef0
parent1b03e98d41741799bebccdac503e4f45dba4bfb4
parenta3cf931e3d4aad28796dd96e9b6d078245189c56
Merge branch 'MDL-70373_311' of https://github.com/timhunt/moodle into MOODLE_311_STABLE