Merge branch 'MDL-40613_master-fix' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 4 Jan 2018 01:57:38 +0000 (09:57 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 4 Jan 2018 01:57:38 +0000 (09:57 +0800)
commit0138cb7cf1e730c627195ac48e743d481700d3d8
treeb021eaab80352e34a7a75394bdd86b635346539d
parent60236650d6535e2712736c1e57a84a0b39446147
parente8a1a5868a620279688c7cd3dce5ff9680bd1f6a
Merge branch 'MDL-40613_master-fix' of git://github.com/markn86/moodle