Merge branch 'MDL-56945-master' of git://github.com/zig-moodle/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 2 Jan 2018 02:09:45 +0000 (10:09 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 2 Jan 2018 02:09:45 +0000 (10:09 +0800)
commitdc61d1bea0831155c2d7f172870e0ccab033f742
tree09df28c5eb4076fdf310a7270f5ad516ef05bb64
parent3fa531ea2c194da30c962da2c893181146c39891
parent6976c8e1b5c71989f961da5ca13994196798fcfb
Merge branch 'MDL-56945-master' of git://github.com/zig-moodle/moodle