From: Bryan Davis <bd808@wikimedia.org>
Date: Thu, 10 Mar 2016 16:47:40 +0000 (-0700)
Subject: composer-merge-plugin: Bump to latest upstream version
X-Git-Tag: 1.31.0-rc.0~7666^2
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=16b70e6aa8f844f70ced3da0d002a1c3c5a0ce48;p=lhc%2Fweb%2Fwiklou.git

composer-merge-plugin: Bump to latest upstream version

v1.3.1 fixes issues with "self.version" constraints in included composer
manifests.

Depends-On: Ic34ea8b4456621e62810ad16692cc2ca7ac5f966
Change-Id: I2fa884a8ff4af42e1a62fa8e5d0799dcfc0f4547
---

diff --git a/composer.json b/composer.json
index cf012a41e1..a21b4e8e98 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
 		"wikimedia/base-convert": "1.0.1",
 		"wikimedia/cdb": "1.3.0",
 		"wikimedia/cldr-plural-rule-parser": "1.0.0",
-		"wikimedia/composer-merge-plugin": "1.3.0",
+		"wikimedia/composer-merge-plugin": "1.3.1",
 		"wikimedia/ip-set": "1.0.1",
 		"wikimedia/php-session-serializer": "1.0.3",
 		"wikimedia/relpath": "1.0.3",