jenkins-bot has submitted this change and it was merged.
Change subject: Merge es2.x into master
......................................................................
Merge es2.x into master
Change-Id: Ice16bbe4f086d1693844d50444782ba89f613aea
---
M .gitreview
M composer.json
2 files changed, 1 insertion(+), 5 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitreview b/.gitreview
index e72671e..2a40129 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
host=gerrit.wikimedia.org
port=29418
project=mediawiki/extensions/Elastica.git
-defaultbranch=es2.x
+defaultbranch=master
defaultrebase=0
diff --git a/composer.json b/composer.json
index ac0f94c..e2b4ee4 100644
--- a/composer.json
+++ b/composer.json
@@ -13,10 +13,6 @@
],
"require": {
"php": ">=5.5.9",
-<<<<<<< HEAD (3ffdde Bump Elastica requirement to 3.3.1 for es2.x)
"ruflin/elastica": "3.1.1"
-=======
- "ruflin/elastica": "2.3.1"
->>>>>>> BRANCH (1b0763 Move iterateOverScroll from Cirrus to Elastica)
}
}
--
To view, visit https://gerrit.wikimedia.org/r/290989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice16bbe4f086d1693844d50444782ba89f613aea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Elastica
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
