Merge branch 'MDL-61829-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Apr 2018 07:28:18 +0000 (15:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Apr 2018 07:28:18 +0000 (15:28 +0800)
commitadf4ae83fc51df9340d7437beb856b9147cfdb54
tree1eae96779ea5d8b2082581f729a31cbe56c49914
parent43c5278ad35b39087b514065263e39a99b254b3c
parentf5edb0c63874bcd2d82b56cb9db84d92425d2c2a
Merge branch 'MDL-61829-master' of git://github.com/zig-moodle/moodle