dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
0c7c5c2
)
Merge "Bump wikimedia/composer-merge-plugin to 1.2.0"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Jun 2015 21:11:01 +0000
(21:11 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Fri, 26 Jun 2015 21:11:01 +0000
(21:11 +0000)
composer.json
patch
|
blob
|
history
diff --git
a/composer.json
b/composer.json
index
7419eb5
..
22bffbe
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"
},