Merge branch 'MDL-62320-master' of git://github.com/vmdef/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 05:47:21 +0000 (13:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 05:47:21 +0000 (13:47 +0800)
commit3b6811a1130944fda2782ab91c307a2ceb2bd7d8
tree6e2ed4636dc4bcc6f43bd19d8269ca38561e0ab9
parentdcb2cea690718db61b0bf31d30bab93f2c6a948d
parent046dd892c72939dff960d3e2c9e016f098966306
Merge branch 'MDL-62320-master' of git://github.com/vmdef/moodle