jenkins-bot has submitted this change and it was merged. Change subject: Merge remote-tracking branch 'origin/master' into es2.x ......................................................................
Merge remote-tracking branch 'origin/master' into es2.x Change-Id: I9e7d3a3f4e1d1876fa42cf00f79639ad02877005 --- M composer.json 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified 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/290403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e7d3a3f4e1d1876fa42cf00f79639ad02877005 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Elastica Gerrit-Branch: es2.x Gerrit-Owner: DCausse <dcau...@wikimedia.org> Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Manybubbles <never...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits