From: Reedy <reedy@wikimedia.org>
Date: Tue, 4 Apr 2017 01:02:21 +0000 (+0100)
Subject: Update composer-merge-plugin from 1.3.1 to 1.4.0
X-Git-Tag: 1.31.0-rc.0~3617^2
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=729deb3ad1e74a7f844e340594b149fdae7f2253;p=lhc%2Fweb%2Fwiklou.git

Update composer-merge-plugin from 1.3.1 to 1.4.0

https://github.com/wikimedia/composer-merge-plugin/releases/tag/v1.4.0
https://github.com/wikimedia/composer-merge-plugin/compare/v1.3.1...v1.4.0

Change-Id: I3e01a632b764f7903291d0141243e6210da9bebe
Depends-On: I0c96d9a630ab25ff4269af25a660c5bd7837a9dc
---

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 08bfae7c8d..964e0bbc6e 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -71,6 +71,7 @@ production.
 * Updated oyejorge/less.php from v1.7.0.10 to v1.7.0.13.
 * Added wikimedia/remex-html v1.0.1.
 * Updated monolog from v1.18.2 to 1.22.1.
+* Updated wikimedia/composer-merge-plugin from v1.3.1 to v1.4.0.
 
 ==== New external libraries ====
 
diff --git a/composer.json b/composer.json
index c0f23dc25c..348f9a32c4 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
 		"wikimedia/base-convert": "1.0.1",
 		"wikimedia/cdb": "1.4.1",
 		"wikimedia/cldr-plural-rule-parser": "1.0.0",
-		"wikimedia/composer-merge-plugin": "1.3.1",
+		"wikimedia/composer-merge-plugin": "1.4.0",
 		"wikimedia/html-formatter": "1.0.1",
 		"wikimedia/ip-set": "1.1.0",
 		"wikimedia/php-session-serializer": "1.0.4",