Merge "Set the package type to 'mediawiki-core'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 10 May 2018 16:48:11 +0000 (16:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 10 May 2018 16:48:11 +0000 (16:48 +0000)
1  2 
composer.json

diff --cc composer.json
Simple merge