Merge branch 'MDL-61529-master' of https://github.com/bmbrands/moodle
commitb2d941c16f0e683c432b2ece350d80d6645924cc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Mar 2018 23:27:48 +0000 (20 00:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Mar 2018 23:27:48 +0000 (20 00:27 +0100)
tree73b1466242e83a5cb32f67fc79dde59c79eae454
parent0fe1ed29d96badf939140d659c1ca73913ef17f3
parentc8842113a774c9a602ad4b7c77b9aaa11234da7b
Merge branch 'MDL-61529-master' of https://github.com/bmbrands/moodle