Merge branch 'MDL-69026-master' of git://github.com/andrewnicols/moodle
commit2b263bf837ee23d14e39b65c4c0a68032ad04c31
authorJun Pataleta <jun@moodle.com>
Fri, 12 Jun 2020 03:58:59 +0000 (12 11:58 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 12 Jun 2020 03:58:59 +0000 (12 11:58 +0800)
tree884596c489b855a97c1cfb0267165680cf567b99
parentaa6830ef990a79010810b3b4d83e5a96d0b862bc
parent8d5926beada20875b4fb24e9b5ddb17a6baf1677
Merge branch 'MDL-69026-master' of git://github.com/andrewnicols/moodle