Merge branch 'MDL-61956-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 06:46:52 +0000 (14:46 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 06:46:52 +0000 (14:46 +0800)
commit2bb0f8923c6787f7d30772d04bc2d9bfbc2182ab
tree925260f50af3e6f00817a1507eade167e7442aba
parent2891577f615f82bac165b88ffdd5a1213b0e961f
parent0188d5b5b44abdd5406f64d02c3bada05bd84c9c
Merge branch 'MDL-61956-master' of https://github.com/lucaboesch/moodle