jenkins-bot has submitted this change and it was merged. Change subject: Merge remote-tracking branch 'origin/wmf/1.24wmf20' into HEAD ......................................................................
Merge remote-tracking branch 'origin/wmf/1.24wmf20' into HEAD Change-Id: I6cc6b9ceb59498c1bf2468b039b252e3e691b6a6 --- M .gitreview 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index 319675f..43fe285 100644 --- a/.gitreview +++ b/.gitreview @@ -2,9 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/extensions/Flow.git -<<<<<<< HEAD (7aeef9 Cascade protection from board to topic) defaultbranch=wmf/1.24wmf19 -======= -defaultbranch=wmf/1.24wmf20 ->>>>>>> BRANCH (90f2c8 Don't let people turn random pages into Flow pages) defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/159408 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6cc6b9ceb59498c1bf2468b039b252e3e691b6a6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: wmf/1.24wmf19 Gerrit-Owner: EBernhardson <[email protected]> Gerrit-Reviewer: EBernhardson <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
