From: Kunal Mehta <legoktm@gmail.com>
Date: Sat, 21 Feb 2015 01:27:20 +0000 (-0800)
Subject: Upgrade composer-merge-plugin to 1.0.0
X-Git-Tag: 1.31.0-rc.0~12323
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=81c5bc12314aea391bfd7252efa6f7a94dd2b3a3;p=lhc%2Fweb%2Fwiklou.git

Upgrade composer-merge-plugin to 1.0.0

* Smaller install size
* Included files are processed recursively, with an option to disable

Change-Id: I65bf1e0d0e972846ed9e30761738aaf3a2127c2f
---

diff --git a/composer.json b/composer.json
index 75aed40070..1650394efe 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
 		"php": ">=5.3.3",
 		"psr/log": "1.0.0",
 		"wikimedia/cdb": "1.0.1",
-		"wikimedia/composer-merge-plugin": "0.5.0",
+		"wikimedia/composer-merge-plugin": "1.0.0",
 		"zordius/lightncandy": "0.18"
 	},
 	"require-dev": {