Merge "Bump wikimedia/composer-merge-plugin to 1.2.0"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Jun 2015 21:11:01 +0000 (21:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 26 Jun 2015 21:11:01 +0000 (21:11 +0000)
composer.json

index 7419eb5..22bffbe 100644 (file)
@@ -26,7 +26,7 @@
                "psr/log": "1.0.0",
                "wikimedia/cdb": "1.0.1",
                "wikimedia/assert": "0.2.2",
-               "wikimedia/composer-merge-plugin": "1.1.0",
+               "wikimedia/composer-merge-plugin": "1.2.0",
                "wikimedia/utfnormal": "1.0.2",
                "zordius/lightncandy": "0.21"
        },