X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=composer.json;h=1e75e6c3acd6f4b20c0b2a7d66e1faf2e1716c73;hb=68e226ca19663818efd9f2037fc1f87aa9671bb0;hp=5901721369771fa409304eebe8670f9dffaeb93e;hpb=b5cf0db5627d6c0bd3483db5ed57e50dfee36227;p=lhc%2Fweb%2Fwiklou.git

diff --git a/composer.json b/composer.json
index 5901721369..1e75e6c3ac 100644
--- a/composer.json
+++ b/composer.json
@@ -16,14 +16,17 @@
 		"wiki": "https://www.mediawiki.org/"
 	},
 	"require": {
+		"cssjanus/cssjanus": "1.1.1",
 		"leafo/lessphp": "0.5.0",
+		"oojs/oojs-ui": "0.6.3",
 		"php": ">=5.3.3",
 		"psr/log": "1.0.0",
-		"cssjanus/cssjanus": "1.1.1",
 		"wikimedia/cdb": "1.0.1",
-		"oojs/oojs-ui": "0.6.1"
+		"wikimedia/composer-merge-plugin": "0.5.0",
+		"zordius/lightncandy": "0.18"
 	},
 	"require-dev": {
+		"justinrainbow/json-schema": "~1.3",
 		"phpunit/phpunit": "*"
 	},
 	"suggest": {
@@ -45,5 +48,12 @@
 	"config": {
 		"prepend-autoloader": false,
 		"optimize-autoloader": true
+	},
+	"extra": {
+		"merge-plugin": {
+			"include": [
+				"composer.local.json"
+			]
+		}
 	}
 }