Merge branch 'MDL-60506-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Oct 2017 05:37:09 +0000 (13:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Oct 2017 05:37:09 +0000 (13:37 +0800)
commit2f5284f5fba657da45d1ef769099b4530d5d0e87
treedaec4d1eb2c479290a8721deed96845c37347423
parent141c4adbb65d84ad27fbb7c604ec5a3d3cf13f34
parent92109e732d6214fc93843a640dc434a74368a9bc
Merge branch 'MDL-60506-master' of git://github.com/lameze/moodle