Merge branch 'MDL-64420-2' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2019 11:56:18 +0000 (12:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2019 11:56:18 +0000 (12:56 +0100)
commit752e2f85e79fc00781f8790dd9862066bce342bb
tree21db81b046fbc303481a5dbcd4a887d4589c51ee
parent6f5d32ea4d65a3a1ec62c8fcabba82da9fde3cb4
parent0d3be6d6480624dde6cf1e527986d7a77375a035
Merge branch 'MDL-64420-2' of https://github.com/timhunt/moodle