Merge branch 'MDL-62571_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2018 23:49:05 +0000 (01:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2018 23:49:05 +0000 (01:49 +0200)
commiteeb0597493011b8bc863670bcd9eecd9a57c34e2
tree06e8dc7d09fd34c335111ddc91dc0b8592ca6da6
parent0197ac313cf9fee888c74a8bae4387b20692a6ca
parent4626c848c23fce160eab0293008e2b94b905ef7c
Merge branch 'MDL-62571_master' of git://github.com/markn86/moodle