Merge "Remove composer.json from .gitignore"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 2 Aug 2017 20:10:53 +0000 (20:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 2 Aug 2017 20:10:53 +0000 (20:10 +0000)

Trivial merge