Merge branch 'MDL-58000-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:39:27 +0000 (23:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:39:27 +0000 (23:39 +0200)
commitca2ac0c1a318dfb8a9c7afb3bce596f625cd8f2a
treecb30f4f9c39300c03161df1046e9313bf27e4ba3
parent13976bcf838cb5452897c861a9e5533aa970f9e6
parent49b464f8148e28a42bb765a5c99db4c7cabf9f22
Merge branch 'MDL-58000-master' of https://github.com/mackensen/moodle