Merge branch 'MDL-67999-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE
commitd1b2b063c921c766a37d3048897a3e39913808c0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Apr 2021 17:30:24 +0000 (14 19:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Apr 2021 17:30:24 +0000 (14 19:30 +0200)
tree8af13e224b8856cf7432f7f5dad7451c1efffcc9
parente0d45a6bc2b03b77880608e4c694d9ac0ceee20e
parentb199ebd0d5b6438bff9f2398e6a3839f212426ff
Merge branch 'MDL-67999-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE