Merge branch 'MDL-61568-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 07:00:16 +0000 (15:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 07:00:16 +0000 (15:00 +0800)
commit2e2c66d84a977f28c832f80036b28f921d9c585c
tree29a7ad66493203258b23894d281cac45e69ad4ab
parent7f2e2bfda9b32ef9232edd627260caf1f5879132
parent202ec23a1f2ae9b78cb5e6d679cbdd6715b630f8
Merge branch 'MDL-61568-master' of git://github.com/zig-moodle/moodle