Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Oct 2018 10:23:53 +0000 (12:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Oct 2018 10:23:53 +0000 (12:23 +0200)
commitda73189b8482dfd14238f333e42faad024b6ff70
tree86f6d0475fcaf855395fec4146f88a0458ce71bc
parent9d4a9e515f7d79a307e34169d1a4023d78ff1bca
parent8951e8b970bb9e20c00f8e77f0bf2ff8570ae2e4
Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle