Merge branch 'MDL-66114-master-2' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Jul 2019 06:28:27 +0000 (14:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Jul 2019 06:28:27 +0000 (14:28 +0800)
commitaeac7a10bc02b69723740ee372e4378d00c2dcfe
treee72c28f8376303bff689778540c10655b69cdcf3
parent1b81ed2f977c77bcce4cc2b3773573cdfe3665ee
parent1f37e37356ba78caeb47653e400ae29d72930f1d
Merge branch 'MDL-66114-master-2' of git://github.com/marinaglancy/moodle