jenkins-bot has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment ......................................................................
Merge branch 'master' into deployment 90d7962 Localisation updates from https://translatewiki.net. 1477543 Localisation updates from https://translatewiki.net. 61d093a Make mailcheck suggestions more subtle f777a6b Make mailcheck more conservative 2fa2172 .gitreview: swapping defaultbranch for track Change-Id: I973dc8dd1943e0640e4728da07aeebfd235b753a --- M .gitreview 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index 3d4864b..ac7cb0d 100644 --- a/.gitreview +++ b/.gitreview @@ -2,9 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/DonationInterface.git -<<<<<<< HEAD (e4dad7 Merge branch 'master' into HEAD) -defaultbranch=deployment -======= track=1 ->>>>>>> BRANCH (98ed4c Merge "Make mailcheck more conservative") defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/317884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I973dc8dd1943e0640e4728da07aeebfd235b753a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg <eeggles...@wikimedia.org> Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
