Merge branch 'MDL-61218-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 28 Jan 2018 23:10:25 +0000 (00:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 28 Jan 2018 23:10:25 +0000 (00:10 +0100)
commitb70c74548b39ec41ebfffcf188cd8ea77abd78ac
treec9a31b3ba9d81f6d82d7df104d88af8bc2d12649
parenta4f914b54dbafcaf1cc2bf1cce8bde30cc69db57
parente63a39e013fc2f5cb474770f905644a6b067316d
Merge branch 'MDL-61218-master' of git://github.com/lameze/moodle