Merge branch 'MDL-61975-master' of git://github.com/zig-moodle/moodle
commit00743c0929b6502ba7537b37d662e5757498bedc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:04:18 +0000 (20 02:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:04:18 +0000 (20 02:04 +0200)
tree2c5776bbfc1bfda0377da6eb07805963d8576a79
parentcd8a0226de2ac9df84151a5521cad59bea30c9c6
parent825c2fdf8c398f25b25b99c52d4dba92a52015bc
Merge branch 'MDL-61975-master' of git://github.com/zig-moodle/moodle