Merge branch 'wip-MDL-62755-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 23:55:53 +0000 (01:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 23:55:53 +0000 (01:55 +0200)
commitb66476d15d7a2c24f404f6439a82b17177fe5804
treef1335f4aff6b55470a403cc440ed81a28d27978e
parentd7a10f5746325ab841f43ed51d9ce5d72c4e1f8c
parent11d828ef6ff1971f119b2c7de235cfe07dbd612e
Merge branch 'wip-MDL-62755-master' of git://github.com/abgreeve/moodle