Merge "Update wikimedia/composer-merge-plugin from 1.4.0 -> 1.4.1"

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 4581066..87e6ce5 100644 (file)
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -50,6 +50,7 @@ section).
 
 ==== Upgraded external libraries ====
 * mediawiki/mediawiki-codesniffer updated to 0.8.1.
+* wikimedia/composer-merge-plugin updated to 1.4.1.
 
 ==== New external libraries ====
 * The class \TestingAccessWrapper has been moved to the external library

diff --git a/composer.json b/composer.json
index 8262880..b9bbe00 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.4.0",
+               "wikimedia/composer-merge-plugin": "1.4.1",
                "wikimedia/html-formatter": "1.0.1",
                "wikimedia/ip-set": "1.1.0",
                "wikimedia/php-session-serializer": "1.0.4",