From 45bf8ad0b9fd55fa3a715a7109eafa53ee33b024 Mon Sep 17 00:00:00 2001 From: Reedy Date: Sun, 16 Jul 2017 16:34:09 +0100 Subject: [PATCH] Update wikimedia/composer-merge-plugin from 1.4.0 -> 1.4.1 https://github.com/wikimedia/composer-merge-plugin/releases/tag/v1.4.1 https://github.com/wikimedia/composer-merge-plugin/compare/v1.4.0...v1.4.1 Change-Id: I805516387648ae76a2b22adac6f94c498b69e6a3 Depends-On: I50338e7f64f8eb3ff9e7177f59d93c88e08562d6 --- RELEASE-NOTES-1.30 | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30 index 453368bebb..7b1a7ce028 100644 --- a/RELEASE-NOTES-1.30 +++ b/RELEASE-NOTES-1.30 @@ -46,6 +46,7 @@ production. ==== 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 8262880fde..b9bbe00986 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.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", -- 2.20.1