X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=blobdiff_plain;f=composer.json;h=d90d8fc7c7aca73a7f21eb02235202a18e584d58;hb=7123bbaa0c9256b2afdd6af48eb1e07463df14ce;hp=78c23cef1100883bb5c09802325bc3d4d94e3b7b;hpb=049e4514d012525e48727fcda2fc38279825cf12;p=lhc%2Fweb%2Fwiklou.git

diff --git a/composer.json b/composer.json
index 78c23cef11..d90d8fc7c7 100644
--- a/composer.json
+++ b/composer.json
@@ -16,12 +16,12 @@
 		"wiki": "https://www.mediawiki.org/"
 	},
 	"require": {
-		"composer/semver": "1.0.0",
+		"composer/semver": "1.2.0",
 		"cssjanus/cssjanus": "1.1.1",
 		"ext-iconv": "*",
 		"liuggio/statsd-php-client": "1.0.16",
 		"mediawiki/at-ease": "1.1.0",
-		"oojs/oojs-ui": "0.13.1",
+		"oojs/oojs-ui": "0.14.0",
 		"oyejorge/less.php": "1.7.0.9",
 		"php": ">=5.3.3",
 		"psr/log": "1.0.0",
@@ -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.2.1",
+		"wikimedia/composer-merge-plugin": "1.3.0",
 		"wikimedia/ip-set": "1.0.1",
 		"wikimedia/relpath": "1.0.3",
 		"wikimedia/running-stat": "1.1.0",
@@ -82,7 +82,8 @@
 		"merge-plugin": {
 			"include": [
 				"composer.local.json"
-			]
+			],
+			"merge-dev": false
 		}
 	}
 }