Merge branch 'MDL-71051-311' of git://github.com/abgreeve/moodle into MOODLE_311_STABLE
commit7103cf86d0a684d11e05541274eb60d40891778e
authorJun Pataleta <jun@moodle.com>
Fri, 30 Apr 2021 06:18:27 +0000 (30 14:18 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 30 Apr 2021 06:18:27 +0000 (30 14:18 +0800)
tree0a54d946b2c4e59e41310dacefb80fa11f08faee
parentf104a01ba5db3fe32fee79974c273da75918d9b7
parentffe3fa8ea8cfae5dee060bc7c25e49331e00f2e0
Merge branch 'MDL-71051-311' of git://github.com/abgreeve/moodle into MOODLE_311_STABLE