Merge branch 'MDL-63655' of git://github.com/stronk7/moodle
commitc3d1878ff3546b13b52b28d164f742ac1ce03854
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 06:53:18 +0000 (25 14:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 06:53:18 +0000 (25 14:53 +0800)
tree0f680dffa904ed753accae65557ee2cf42278775
parentc7be63a45dfb97e508d6576f9674a91dd9285626
parent040360468c2aa8cdf94604b3910340c711375e3d
Merge branch 'MDL-63655' of git://github.com/stronk7/moodle