Merge branch 'MDL-55364-master-fix' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Aug 2017 02:51:05 +0000 (10:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Aug 2017 02:51:05 +0000 (10:51 +0800)
commit71fac459b62f0b794297a5431e1f586e3e4c4d7f
tree40d843b8a18ec7144a5fad1cc9f0c38f42bf611a
parent2b2ae405f0176b4b8b087d3507253a8ff097c701
parent9c89d3aec1cf349fb8c30f8de3474957d3646815
Merge branch 'MDL-55364-master-fix' of https://github.com/xow/moodle