EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339042 )
Change subject: Merge remote-tracking branch 'origin/master' into es5
......................................................................
Merge remote-tracking branch 'origin/master' into es5
Change-Id: I3b80db339970f824ed4406765e56a5b8b86535a6
---
M composer.json
M composer.lock
2 files changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor
refs/changes/42/339042/1
diff --git a/composer.json b/composer.json
index 2cc8d2e..9289d7f 100644
--- a/composer.json
+++ b/composer.json
@@ -52,12 +52,8 @@
"pear/pear-core-minimal": "1.10.1",
"pear/pear_exception": "1.0.0",
"php": ">=5.5.9",
-<<<<<<< HEAD (dfd24f Merge remote-tracking branch 'origin/master' into es5)
- "pimple/pimple": "2.1.1",
"ruflin/elastica": "5.0.0",
-=======
"pimple/pimple": "3.0.2",
->>>>>>> BRANCH (872c93 Update pimple/pimple to 3.0.2)
"psr/log": "1.0.2",
"stil/gd-text": "1.0.0",
"symfony/process": "3.0.4",
diff --git a/composer.lock b/composer.lock
index 0275a84..c234ebe 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,13 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-<<<<<<< HEAD (dfd24f Merge remote-tracking branch 'origin/master' into es5)
- "hash": "2864cd5a28afff034a92dd6356a22687",
- "content-hash": "dae6030c2992b8d32e47c8111a724cdf",
-=======
- "hash": "f0fa1222397a98ccd124dcf0d66a7144",
- "content-hash": "29352279c5eae2b74f1c7a5ec6420277",
->>>>>>> BRANCH (872c93 Update pimple/pimple to 3.0.2)
+ "hash": "87ea1c529b568e3723c696a62a0ffda3",
+ "content-hash": "ba9956a7e43e7d91d510fed0e29edb04",
"packages": [
{
"name": "composer/semver",
--
To view, visit https://gerrit.wikimedia.org/r/339042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b80db339970f824ed4406765e56a5b8b86535a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: es5
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
