Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 19 Oct 2018 15:11:13 +0000 (17:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 19 Oct 2018 15:11:13 +0000 (17:11 +0200)

Trivial merge