Merge branch 'MDL-67248-master' of git://github.com/cescobedo/moodle
commitccd5f606c32847d633782535ea29255a90f8515f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 Nov 2019 00:12:01 +0000 (14 01:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 Nov 2019 00:12:01 +0000 (14 01:12 +0100)
treef65552a708a0924887044e1d499ef26354f3d195
parentf136aa19330f2dbf717b9aebfdc8fa9e66c41a67
parentf12d708e615ad4fa46f64ebef79c8faeec6c7cc8
Merge branch 'MDL-67248-master' of git://github.com/cescobedo/moodle