Merge branch 'MDL-63606-master-2' of git://github.com/mihailges/moodle
commit4b7418d3b0409bf68fa56e0a75a445fd87289e56
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 00:51:35 +0000 (31 08:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 00:51:35 +0000 (31 08:51 +0800)
tree8f0172cb3bba3d39bdcf8a0bdeef815eb7fea144
parent17109340cc560409f87c63c59b969cce0864a295
parent541982c01e87eed7efee36fd09945276abb45d70
Merge branch 'MDL-63606-master-2' of git://github.com/mihailges/moodle