Merge branch 'MDL-60145-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 16:56:34 +0000 (18:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 16:56:34 +0000 (18:56 +0200)
commite38e2cde4ee7a6e789cc82ab6c63f60e5fa78be0
tree497f79391013281f2c710aea5a8820e5a5b766e0
parenta2d2ed90c297597e740e3764116ce2a8863e19e4
parentde60737dd7d063827e744b5bbac28a0ebadf3504
Merge branch 'MDL-60145-master' of https://github.com/snake/moodle