Merge branch 'MDL-61947-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Apr 2018 06:51:19 +0000 (14:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Apr 2018 06:51:19 +0000 (14:51 +0800)
commit46e7b6eecf3f6c72e7b645b695af6f96dd4e0af1
tree9ab31a68846c72b3af4e386ec6d7d0ff1e48546a
parentaad67f481a372ef02bf1caf1d357739e3d577d4b
parent25e213ad8f3a5948f235eea7706b0c7f107b150e
Merge branch 'MDL-61947-master' of git://github.com/zig-moodle/moodle