Merge "Update composer-merge-plugin from 1.3.1 to 1.4.0"

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 08bfae7..964e0bb 100644 (file)
--- 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 c0f23dc..348f9a3 100644 (file)
--- 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",