Merge branch 'MDL-61860-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 23:00:31 +0000 (01:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 23:00:31 +0000 (01:00 +0200)
commit1f4670653dc204a64dc3961d79e0e28a1c301117
tree9335dea1fef587c70712b439bd6ba69e20edf462
parent805a3a4ed79eddf033bf64192d1982c0eb5e35c9
parentbaab37149d092b7dca25705e211211d09d2074a0
Merge branch 'MDL-61860-master' of https://github.com/mackensen/moodle