Merge branch 'MDL-61877-master' of git://github.com/FMCorz/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 4 May 2018 03:25:49 +0000 (11:25 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 4 May 2018 03:25:49 +0000 (11:25 +0800)
commitcb596d823f293d6d5f98173b8414f4eee4231137
tree366d81e56734ef0ebc239552f9191d8f8264ff16
parent2cae92c6c3c837d48d17546a478f8e642e60f853
parent739b59610a0eb8d9e7f33c425ff901a843ccfa89
Merge branch 'MDL-61877-master' of git://github.com/FMCorz/moodle