DCausse has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290979
Change subject: Merge es2.x back into master
......................................................................
Merge es2.x back into master
Change-Id: I4625d2bc9f8518b2ef8b06572d647502164c2928
---
M .gitreview
M composer.lock
2 files changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor
refs/changes/79/290979/1
diff --git a/.gitreview b/.gitreview
index 1aa40cd..e4d6d34 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
host=gerrit.wikimedia.org
port=29418
project=mediawiki/vendor.git
-defaultbranch=es2.x
+defaultbranch=master
defaultrebase=0
diff --git a/composer.lock b/composer.lock
index f0b1459..eeafbf0 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 (19639d Merge branch 'master' into es2.x)
- "hash": "412c73ef489449a139a67079a8be51e5",
- "content-hash": "699128f236799508862ecd32bc4f8902",
-=======
- "hash": "b4e1317390ac96c9e2e5174390879f50",
- "content-hash": "fd539bcbde44e20ed005eecf15c4e691",
->>>>>>> BRANCH (e3a58e Update OOjs UI to v0.17.3)
+ "hash": "7253faa6e78c67e17f3e0ed6b88e2c0c",
+ "content-hash": "fa3b66688dd61115f4e93a380b664a6d",
"packages": [
{
"name": "composer/semver",
--
To view, visit https://gerrit.wikimedia.org/r/290979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4625d2bc9f8518b2ef8b06572d647502164c2928
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
