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
Merge "Skip ApiStashEdit if custom DataUpdates are present."
[lhc/web/wiklou.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index
d7a7f04
..
4717aa9
100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-16,14
+16,16
@@
"wiki": "https://www.mediawiki.org/"
},
"require": {
"wiki": "https://www.mediawiki.org/"
},
"require": {
+ "cssjanus/cssjanus": "1.1.1",
"leafo/lessphp": "0.5.0",
"leafo/lessphp": "0.5.0",
+ "oojs/oojs-ui": "0.6.1",
"php": ">=5.3.3",
"psr/log": "1.0.0",
"php": ">=5.3.3",
"psr/log": "1.0.0",
- "cssjanus/cssjanus": "1.1.1",
"wikimedia/cdb": "1.0.1",
"wikimedia/cdb": "1.0.1",
- "
oojs/oojs-ui
": "0.5.0"
+ "
wikimedia/composer-merge-plugin
": "0.5.0"
},
"require-dev": {
},
"require-dev": {
+ "justinrainbow/json-schema": "~1.3",
"phpunit/phpunit": "*"
},
"suggest": {
"phpunit/phpunit": "*"
},
"suggest": {
@@
-45,5
+47,12
@@
"config": {
"prepend-autoloader": false,
"optimize-autoloader": true
"config": {
"prepend-autoloader": false,
"optimize-autoloader": true
+ },
+ "extra": {
+ "merge-plugin": {
+ "include": [
+ "composer.local.json"
+ ]
+ }
}
}
}
}