DCausse has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290977
Change subject: Merge remote-tracking branch 'origin/master' into es2.x
......................................................................
Merge remote-tracking branch 'origin/master' into es2.x
Change-Id: I9e7d3a3f4e1d1876fa42cf00f79639ad02877005
---
M .gitreview
M composer.json
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Elastica
refs/changes/77/290977/1
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/290977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e7d3a3f4e1d1876fa42cf00f79639ad02877005
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Elastica
Gerrit-Branch: master
Gerrit-Owner: DCausse <dcau...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
