Merge branch 'MDL-71343-m311' of https://github.com/rjnl/moodle into MOODLE_311_STABLE
commit9ad6dce4593164dbb15425e8a366585a45690c74
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 May 2021 21:07:37 +0000 (6 23:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 May 2021 21:07:37 +0000 (6 23:07 +0200)
treebb1b5c481b521d090f4ebdb8c099df3c7c633b3c
parentc7e3291ac81f4381aa8cf60f11dcd2a2a315005c
parentc217daf2a43ca48eae4086b2c8eaf9e32a2bac9e
Merge branch 'MDL-71343-m311' of https://github.com/rjnl/moodle into MOODLE_311_STABLE