Merge branch 'MDL-68998-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 00:33:38 +0000 (08:33 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 00:33:38 +0000 (08:33 +0800)
commitbe80ef1cd22fa1d018f27d7e0b640a8b98b2b8b1
treed2b12a2df22c77b0e079044b472769caf3c231c1
parent1495cf837ebf87f4873bbd312655bffaa0ea16da
parent8eaad10b5f6f663dfbdb12fed37e3ddf1fc2b634
Merge branch 'MDL-68998-master' of git://github.com/marinaglancy/moodle