Merge branch 'MDL-61305-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 00:17:49 +0000 (08:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 00:17:49 +0000 (08:17 +0800)
commitaf5f446fa85c83f09daa80ed413e84c972e7202a
treec8ce7e3dbf444176afe51ef5ca6344558d88fb55
parentd461d093bdfef862b12e3fbbc3c0833cd7bf8bb1
parent08ec1b4e47d73a1bd4cae3947e353477c3a8a9f2
Merge branch 'MDL-61305-master' of https://github.com/sammarshallou/moodle