From: Bryan Davis <bd808@wikimedia.org>
Date: Mon, 6 Jul 2015 22:46:45 +0000 (-0600)
Subject: Update composer-merge-plugin to v1.2.1
X-Git-Tag: 1.31.0-rc.0~10871
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=eba9321b2b75823f8e9797398f44944e8a05389a;p=lhc%2Fweb%2Fwiklou.git

Update composer-merge-plugin to v1.2.1

Fixes bug in optimized autoloader generation on initial plugin install.

Change-Id: If637d2b5583b32895fe8839478e7e553927f1d68
Requires: I22d1fd4044320613c6ba61ac5e84263e5af4ff27
Bug: T104037
---

diff --git a/composer.json b/composer.json
index 929b3e50b6..95950829cc 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
 		"psr/log": "1.0.0",
 		"wikimedia/cdb": "1.0.1",
 		"wikimedia/assert": "0.2.2",
-		"wikimedia/composer-merge-plugin": "1.2.0",
+		"wikimedia/composer-merge-plugin": "1.2.1",
 		"wikimedia/utfnormal": "1.0.2",
 		"zordius/lightncandy": "0.21"
 	},