Merge branch 'MDL-52052-master' of git://github.com/mihailges/moodle
commit11eb85e4946d6fb16ce2c4f4ea1335184416b906
authorJun Pataleta <jun@moodle.com>
Wed, 22 Jul 2020 05:47:14 +0000 (22 13:47 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 22 Jul 2020 05:47:14 +0000 (22 13:47 +0800)
tree5660be1b8dbdd735c44153cf949739f76e681cdc
parentc765b1f7e24ce46b79966336edeaf1d3e13dc6ae
parentf9bcf22483eaad46db6c2c5b4913aef1ddbbbaa6
Merge branch 'MDL-52052-master' of git://github.com/mihailges/moodle