Merge branch 'MDL-62295-master' of git://github.com/bmbrands/moodle
commite2ede0b5c346edff6e6e4a01805499ef19182f0a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 May 2018 23:02:35 +0000 (8 01:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 May 2018 23:02:35 +0000 (8 01:02 +0200)
treea1dbf47d825b47331a2f23a11425adbc9e5d6ec9
parentd0ce3439fe671bd67d465fa5c48e1af98376025c
parent54cbfbca8a46ab3c2fbb7ff1e9d4dff3d7474c5a
Merge branch 'MDL-62295-master' of git://github.com/bmbrands/moodle