Merge branch 'MDL-62658_master' of git://github.com/markn86/moodle
commit35f5be26aeb950e3b2f21921e101173a0b1675ed
authorJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 06:36:54 +0000 (18 14:36 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 06:36:54 +0000 (18 14:36 +0800)
treedff3a608c85e5a7d620b118f2525f5ab0639cbd0
parent4fb6f0b5ce5880055bac0399613cb75fd0966466
parent4f6cb2ee77945321625ce0e9ed634a835d7d323c
Merge branch 'MDL-62658_master' of git://github.com/markn86/moodle