Merge branch 'MDL-69260_master' of git://github.com/adpe/moodle
commita1b2045364cd2e7d44b030f0f2527b059c119c8d
authorJun Pataleta <jun@moodle.com>
Mon, 27 Jul 2020 02:53:23 +0000 (27 10:53 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 27 Jul 2020 02:53:23 +0000 (27 10:53 +0800)
tree9cbde7ca892eb056ede68b13134f867f415a0c1d
parent0f70cf0497cfd1c9aadd52967fb60182a9be171c
parentd4dc94ec8d884c2a6277ad1dfa69cdd1a5f25251
Merge branch 'MDL-69260_master' of git://github.com/adpe/moodle