Merge branch 'MDL-61862-master' of git://github.com/FMCorz/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Apr 2018 15:30:42 +0000 (23:30 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Apr 2018 15:30:42 +0000 (23:30 +0800)
commitd51c9467002d152179030b573baae34b7ea7830b
treee65615fe06c6353f056467f158bbee3cae6c08ae
parent06dbe955d07604910dc8e5c21dde074c94ecce2a
parent9f6296e5de8bba2c0115e2e41d1310336c3048bc
Merge branch 'MDL-61862-master' of git://github.com/FMCorz/moodle