Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 18 Oct 2018 07:48:47 +0000 (15:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 18 Oct 2018 07:48:47 +0000 (15:48 +0800)
commit78f6d5196dda7d349582a5e891be8e2365a8b11a
treef017a44cc671c01c7ab269ac98227037ead92e74
parentde632063af446d07468bce925ea3809bdd41eff6
parent68eaa3150eadece016c5504e0e8a7a885ffbf992
Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle