Merge branch 'MDL-61882-master' of git://github.com/cescobedo/moodle
commit74329331aa188d6c61b4edd7a7c43da0fedf8adf
authorJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 01:38:27 +0000 (24 09:38 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 01:38:27 +0000 (24 09:38 +0800)
tree7438f9ac61cac91c218b69eb874af66e8763a566
parentebc09da8a671ccd608b1ed8632255873899ec85b
parent21ae0446207b0384868f83485f8592f503a3daa8
Merge branch 'MDL-61882-master' of git://github.com/cescobedo/moodle