Merge branch 'MDL-70139-310' of git://github.com/sarjona/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 17:56:00 +0000 (18:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 17:56:00 +0000 (18:56 +0100)
commitf9dc16ca0521d123f28744fed462734d4e147b93
tree4f6c615f69c5aadac947fa67db53dcd41e448bc3
parent022a0196376c490e3cb1f975396de713d6cedffd
parent29f7a9a210545af697153d95fdf50a0c81c0c3bd
Merge branch 'MDL-70139-310' of git://github.com/sarjona/moodle into MOODLE_310_STABLE