Merge branch 'MDL-70342-master' of git://github.com/abias/moodle
authorSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 14:28:39 +0000 (15:28 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 14:28:39 +0000 (15:28 +0100)
commitcb9b0032be18c463d6b6f7bf042cf1d96ae8e260
tree357a4de635536a6a33831c62efc8b8904c5123dc
parent50cfe2c0a2ddd3f388eb44a8935984c4eac67cc3
parent3c0a064421cec705be83a00c76e22ffe48ca6dda
Merge branch 'MDL-70342-master' of git://github.com/abias/moodle