Merge branch 'MDL-42676-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Dec 2017 07:08:37 +0000 (15:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Dec 2017 07:08:37 +0000 (15:08 +0800)
commitb91696eeac0e9ae6f9e101d6344609b8bb5e640b
tree2c04eb252de4d451ae6e0c2897345d5eb966cbd6
parent6cb535f081533706d17143c60a6c2a3cfe66154e
parent6901981962604c4921ad606a21b547f9b71baf45
Merge branch 'MDL-42676-master' of git://github.com/zig-moodle/moodle