Merge branch 'MDL-61460-master-fix' of https://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 8 Jul 2021 03:18:29 +0000 (11:18 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Jul 2021 21:30:34 +0000 (23:30 +0200)
commit65642ef97a134b82095f830829a4cf695f3b324e
treed249e67d42bcc2a46fccf1e8e704c5810f07648a
parentf03a714607cb7761aa888f982d795b4204fb24b3
parentf1525fbdbf41142e40c75bb949663e0f6da9adfe
Merge branch 'MDL-61460-master-fix' of https://github.com/andrewnicols/moodle