Merge branch 'MDL-58006-master' of git://github.com/zig-moodle/moodle
commit447cf624097fbb4107f29f02649fe30e0d5e6999
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 18:57:33 +0000 (22 19:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 18:57:33 +0000 (22 19:57 +0100)
tree9916ed16ff16080378877a05526eec54723b9689
parent3c2501ac77d59f2bcf1aa5529a786ae7ff617969
parent1a9e8542c543b1d4d4d6c67197d2ec3453a7b469
Merge branch 'MDL-58006-master' of git://github.com/zig-moodle/moodle