EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/159406
Change subject: Merge remote-tracking branch 'origin/wmf/1.24wmf20' into 1.24wmf19 ...................................................................... Merge remote-tracking branch 'origin/wmf/1.24wmf20' into 1.24wmf19 Change-Id: I09d15d74e1ece80d460bb272d1d65753fd20c617 --- M .gitreview 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/06/159406/1 diff --git a/.gitreview b/.gitreview index 584a146..cc4678b 100644 --- a/.gitreview +++ b/.gitreview @@ -2,9 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/Echo.git -<<<<<<< HEAD (da8e0c New users don't get welcome notification.) defaultbranch=wmf/1.24wmf19 -======= -defaultbranch=wmf/1.24wmf20 ->>>>>>> BRANCH (2c5298 Default to alerts tab) defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/159406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09d15d74e1ece80d460bb272d1d65753fd20c617 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: wmf/1.24wmf19 Gerrit-Owner: EBernhardson <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
