dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mediawiki.api: fix badtoken handling with legacy token types
[lhc/web/wiklou.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index
4aa9b92
..
0f8da12
100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-16,19
+16,20
@@
"wiki": "https://www.mediawiki.org/"
},
"require": {
"wiki": "https://www.mediawiki.org/"
},
"require": {
- "composer/semver": "1.
0
.0",
+ "composer/semver": "1.
2
.0",
"cssjanus/cssjanus": "1.1.1",
"ext-iconv": "*",
"cssjanus/cssjanus": "1.1.1",
"ext-iconv": "*",
- "liuggio/statsd-php-client": "1.0.1
6
",
+ "liuggio/statsd-php-client": "1.0.1
8
",
"mediawiki/at-ease": "1.1.0",
"mediawiki/at-ease": "1.1.0",
- "oojs/oojs-ui": "0.1
3
.0",
+ "oojs/oojs-ui": "0.1
4
.0",
"oyejorge/less.php": "1.7.0.9",
"php": ">=5.3.3",
"psr/log": "1.0.0",
"wikimedia/assert": "0.2.2",
"oyejorge/less.php": "1.7.0.9",
"php": ">=5.3.3",
"psr/log": "1.0.0",
"wikimedia/assert": "0.2.2",
+ "wikimedia/base-convert": "1.0.1",
"wikimedia/cdb": "1.3.0",
"wikimedia/cldr-plural-rule-parser": "1.0.0",
"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",
"wikimedia/ip-set": "1.0.1",
"wikimedia/relpath": "1.0.3",
"wikimedia/running-stat": "1.1.0",
@@
-81,7
+82,8
@@
"merge-plugin": {
"include": [
"composer.local.json"
"merge-plugin": {
"include": [
"composer.local.json"
- ]
+ ],
+ "merge-dev": false
}
}
}
}
}
}