Merge branch 'wip-MDL-57649-master-fix2' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Jul 2017 02:22:25 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Jul 2017 02:22:25 +0000 (10:22 +0800)
commit103cd4d39419a61ff39e33be0af0a3fc5c956678
tree490eaf46edb027d26135b3204d03ede347e3a89b
parentdda72b9d564aa78e29d51a32e3d0499e0b1ed49e
parent7b78154e39e1131c7cc382ff99c3a60f584638ff
Merge branch 'wip-MDL-57649-master-fix2' of git://github.com/abgreeve/moodle