Merge branch 'MDL-69109-master-2' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 00:39:32 +0000 (08:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 00:39:32 +0000 (08:39 +0800)
commit145604590fbb3699d4ef00f1716eb6305a1fc054
tree544f998a6d823237bc3e3ca43c12167f81050cf0
parent7a5f2d0b78b20ca1388988be2b7dcc00f713cc5b
parent9c10de7f359faff7afacf20f6e2c633d7b472e18
Merge branch 'MDL-69109-master-2' of git://github.com/marinaglancy/moodle