Merge branch 'MDL-55449-master' of git://github.com/abgreeve/moodle
commit7b4dbb05e332cf40b879735ecc936553e981215a
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 03:44:38 +0000 (7 11:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 03:44:38 +0000 (7 11:44 +0800)
treee1804e1bb774ab4f13fb6d0ff0a7dedd7d571115
parent19d5c416e02bb8e52855b6979392014cd96bc79b
parentcc4952e997ea152012281c93a05cccffbda02c55
Merge branch 'MDL-55449-master' of git://github.com/abgreeve/moodle