Merge branch 'wip-MDL-60546-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 22 Nov 2017 07:28:11 +0000 (20:28 +1300)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:33 +0000 (13:24 +0100)
commitddb3857cdf9df89d491194b35929b691b81dee5d
tree37ae5fe0b2ac7bfd60a892766d6c86359801b14b
parent9ff02b52b2024738b8e7202f1675aa17593a6c75
parent7b4e9950159cc44b80f66629e2ec737ae2912154
Merge branch 'wip-MDL-60546-master' of git://github.com/abgreeve/moodle