Merge branch 'MDL-61451-master' of git://github.com/cescobedo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 23:39:36 +0000 (01:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 23:39:36 +0000 (01:39 +0200)
commit92221e9d442037fdf65bb512c055b96591490e1b
treefb31a7fe17cc541d109b4ab237fde37a814ee36b
parentc8cbdfce246dcfc5fa808bcaf7ce2877441aa0ea
parent00a75115807909d028da26efd74aa41d71acf976
Merge branch 'MDL-61451-master' of git://github.com/cescobedo/moodle