Merge branch 'MDL-71947-310' of https://github.com/bmbrands/moodle into MOODLE_310_STABLE
commit1eee862487ed07e0a4f412717bba06668cf85048
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jun 2021 16:30:44 +0000 (29 18:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jun 2021 16:30:44 +0000 (29 18:30 +0200)
treecf0964c930ede5dc7b160764eded78bc3f2ff8d4
parentb304fa4a856b61991556b0a3f3bfb7c8be5b4611
parent4ef81f55109a356d6c7df5478eb74abfc8043e38
Merge branch 'MDL-71947-310' of https://github.com/bmbrands/moodle into MOODLE_310_STABLE