Merge branch 'MDL-66133-master' of git://github.com/abias/moodle
commit998f605d5c8ba3ca71d74899bb048834e5ae5d22
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Aug 2019 15:38:25 +0000 (28 17:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Aug 2019 15:38:25 +0000 (28 17:38 +0200)
tree53d398669f725b7472ee0a6b50d2cfe4606d7d95
parentfd3e11a6deb05e5173257d76b4e4b17f0530fc81
parent7e00bfd9f1b6ce7d9db111797e93053841238024
Merge branch 'MDL-66133-master' of git://github.com/abias/moodle