Merge branch 'MDL-60549-master' of https://github.com/davidknu/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 02:08:26 +0000 (10:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 02:08:26 +0000 (10:08 +0800)
commit5705fd0907e7d01563b34c3e59ed0385af37c698
treee711495972eb7e798fee9f6dd5854991f8451505
parent0881745a9e4f512704a41b98edf142ea97896cae
parentcc3c33f8baa8f7112c1877f14482c09a6da014a5
Merge branch 'MDL-60549-master' of https://github.com/davidknu/moodle