Merge branch 'MDL-71182-311-2' of git://github.com/lameze/moodle into MOODLE_311_STABLE
commita771fddb27814eb3d0c8f8be40e3a454bab98519
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Mar 2021 09:49:32 +0000 (24 10:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Mar 2021 09:49:32 +0000 (24 10:49 +0100)
treec4e3181e8200107ddfbf0a7fca02cc5abf62f655
parent7fb15daff2f1bdd96ed38c8cebffe823193c800b
parent5efbb6402b7860742fc0501f09c7ae59bb6d6a65
Merge branch 'MDL-71182-311-2' of git://github.com/lameze/moodle into MOODLE_311_STABLE