dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0171d90
)
Bump composer-merge-plugin to v1.1.0
author
Bryan Davis
<bd808@wikimedia.org>
Thu, 28 May 2015 00:39:06 +0000
(18:39 -0600)
committer
Legoktm
<legoktm.wikipedia@gmail.com>
Thu, 28 May 2015 03:37:28 +0000
(
03:37
+0000)
Bug: T97560
Change-Id: Idc3ae196f7fc9483f5c474b32d92e30be8325d62
composer.json
patch
|
blob
|
history
diff --git
a/composer.json
b/composer.json
index
2f6cc42
..
f87dbe7
100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-25,7
+25,7
@@
"psr/log": "1.0.0",
"wikimedia/cdb": "1.0.1",
"wikimedia/assert": "0.2.2",
- "wikimedia/composer-merge-plugin": "1.
0
.0",
+ "wikimedia/composer-merge-plugin": "1.
1
.0",
"wikimedia/utfnormal": "1.0.2",
"zordius/lightncandy": "0.21"
},