Merge branch 'MDL-69902' of https://github.com/marinaglancy/moodle
commit127befd73ba6c72e95c03e5ca33b33c3a940ab84
authorJake Dallimore <jake@moodle.com>
Wed, 21 Oct 2020 02:57:15 +0000 (21 10:57 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 21 Oct 2020 02:57:15 +0000 (21 10:57 +0800)
tree70f33152ba895a3ebb76b982c69948ce123b4ff1
parent3d0f28ebb83d511d59c7041f68c0b1f8f36652be
parentbe53990301bfa400471459daad7a044e0f6de97e
Merge branch 'MDL-69902' of https://github.com/marinaglancy/moodle