X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=composer.json;h=e0cece565002d4b63ccb945702e1c837fa7555b5;hb=d0e47d475cd7efd7541d51e02ab216a966da8b1f;hp=78c23cef1100883bb5c09802325bc3d4d94e3b7b;hpb=70fcdfe0f436f19de4cb6e0ccb5990d44f43c100;p=lhc%2Fweb%2Fwiklou.git diff --git a/composer.json b/composer.json index 78c23cef11..e0cece5650 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", + "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.13.1", + "oojs/oojs-ui": "0.14.1", "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 } } }