Merge branch 'MDL-62169-master' of git://github.com/zig-moodle/moodle
commitb175d43408c317c02ee557cbc02dd287897a5b08
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 09:24:26 +0000 (7 17:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 09:24:26 +0000 (7 17:24 +0800)
treeaa48a5dfcc735e9f435ffa15da1997a45448ee4f
parentea083b0a5e75036fba22ec71c0b8e444c1097db6
parent966dd82d902b22029e7346e2f133e0dd7680f471
Merge branch 'MDL-62169-master' of git://github.com/zig-moodle/moodle