Merge branch 'MDL-62614-master' of git://github.com/zig-moodle/moodle
commit0197ac313cf9fee888c74a8bae4387b20692a6ca
authorJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 08:12:40 +0000 (18 16:12 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 08:12:40 +0000 (18 16:12 +0800)
tree9014679cb0a161cd1e3b11ad79a16a18583164d6
parentd2b1d001bb8693f4898abb369a02ab3603a80f0f
parentaf2e8ed947bedfc174b871b4eb510473ab58e4fe
Merge branch 'MDL-62614-master' of git://github.com/zig-moodle/moodle