Merge branch 'MDL-71157-master' of git://github.com/sarjona/moodle
commit97429f82b470841354eb78e8be5917ff181101a8
authorJun Pataleta <jun@moodle.com>
Thu, 20 May 2021 04:30:15 +0000 (20 12:30 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 20 May 2021 04:30:15 +0000 (20 12:30 +0800)
treef93a868a418af616eb19a0d3f80ba449e5577a59
parentde3f8e1240002fa9b4859fbdb35cc769745bc958
parentfd8dabc9fef5fbf0a325ee8d41a1bed4e4c5d4aa
Merge branch 'MDL-71157-master' of git://github.com/sarjona/moodle