From: Bryan Davis <bd808@wikimedia.org>
Date: Thu, 28 May 2015 00:39:06 +0000 (-0600)
Subject: Bump composer-merge-plugin to v1.1.0
X-Git-Tag: 1.31.0-rc.0~11272^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=7bd889ee0410b3356817be9384ec059511bf3546;p=lhc%2Fweb%2Fwiklou.git

Bump composer-merge-plugin to v1.1.0

Bug: T97560
Change-Id: Idc3ae196f7fc9483f5c474b32d92e30be8325d62
---

diff --git a/composer.json b/composer.json
index 2f6cc42467..f87dbe7211 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
 		"psr/log": "1.0.0",
 		"wikimedia/cdb": "1.0.1",
 		"wikimedia/assert": "0.2.2",
-		"wikimedia/composer-merge-plugin": "1.0.0",
+		"wikimedia/composer-merge-plugin": "1.1.0",
 		"wikimedia/utfnormal": "1.0.2",
 		"zordius/lightncandy": "0.21"
 	},