Merge "Don't run phpcs on node_modules folder"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 May 2015 18:28:35 +0000 (18:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 May 2015 18:28:35 +0000 (18:28 +0000)
1  2 
composer.json

diff --cc composer.json
Simple merge