Merge branch 'MDL-67625-master' of git://github.com/lucaboesch/moodle
commitcaa722a04bfe238917bb1ccf189e1f6c137444c6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 23:26:13 +0000 (16 00:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 23:26:13 +0000 (16 00:26 +0100)
treef2702aa1a47ea63c38475523e0683124f49e78b6
parent2b12a3668fedb378ccf88577669659685109360b
parentd4bca909c21742d238d88839815e6d20649d68a0
Merge branch 'MDL-67625-master' of git://github.com/lucaboesch/moodle