Merge branch 'MDL-61848-master' of git://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 20 Apr 2018 01:20:13 +0000 (09:20 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 20 Apr 2018 01:20:13 +0000 (09:20 +0800)
commitc1f7e7e90e4ce38b2cdbc02a677d34abbf84171d
tree3504556d1184fb0582a282f73869fae25db45f62
parent1bcbbe3582d87f2a976e2206888a19858b9de3f9
parent3029395e9d533d65f5506e6ca199bb8a3d061fb8
Merge branch 'MDL-61848-master' of git://github.com/cescobedo/moodle