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 "build: Updating development dependencies"
[lhc/web/wiklou.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index
1b2de96
..
f72e7e4
100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-26,7
+26,7
@@
"psr/log": "1.0.0",
"wikimedia/cdb": "1.0.1",
"wikimedia/assert": "0.2.2",
- "wikimedia/composer-merge-plugin": "1.
1
.0",
+ "wikimedia/composer-merge-plugin": "1.
2
.0",
"wikimedia/utfnormal": "1.0.2",
"zordius/lightncandy": "0.21"
},