Merge branch 'MDL-65656-master-2' of git://github.com/andrewnicols/moodle
commit5daeae8867cb02458ed0776e2fc7f2fa27e9c211
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Jul 2019 00:16:35 +0000 (3 02:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Jul 2019 00:16:35 +0000 (3 02:16 +0200)
tree2283713f6c430636048add4599916f82b1a5966a
parent45a8249431fb5a23adaadbbd3c0409dce402a38f
parenta2f81b201e2537b683b548e040106d01fcd3c695
Merge branch 'MDL-65656-master-2' of git://github.com/andrewnicols/moodle