Merge branch 'MDL-60431_311' of https://github.com/jonof/moodle into MOODLE_311_STABLE
commit44257ec096ec0eb3804fda296f64ca68456a422e
authorJun Pataleta <jun@moodle.com>
Fri, 21 May 2021 00:57:20 +0000 (21 08:57 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 21 May 2021 00:57:20 +0000 (21 08:57 +0800)
tree6f7d74307c5554ddabd094741647557bcf810664
parentbeefea6bad8cbdd1d856237f4e09ac3bfb521a36
parentf2c9e1728e15e1a9996f1193d8e47dd7ad08ae95
Merge branch 'MDL-60431_311' of https://github.com/jonof/moodle into MOODLE_311_STABLE