Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391617 )
Change subject: Merge tag 'debian/1%1.27.4-1' into jessie ...................................................................... Merge tag 'debian/1%1.27.4-1' into jessie mediawiki Debian release 1:1.27.4-1 Change-Id: I88ed1194c4d8e2e3214753cf24abff500156adaa --- M debian/changelog 1 file changed, 6 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/17/391617/1 diff --git a/debian/changelog b/debian/changelog index ecb38ae..84ff066 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -<<<<<<< HEAD (bd463b Merge branch 'master' into jessie) -mediawiki (1:1.27.3-1~bpo8+1) jessie-backports; urgency=medium - - * Rebuild for jessie-backports. - - -- Kunal Mehta <[email protected]> Mon, 01 May 2017 15:27:58 -0700 -======= mediawiki (1:1.27.4-1) unstable; urgency=medium * Imported Upstream version 1.27.4 (security release), fixing @@ -15,7 +8,12 @@ web access to the vendor/ directory. -- Kunal Mehta <[email protected]> Tue, 14 Nov 2017 15:52:47 -0800 ->>>>>>> BRANCH (843acc changelog for 1:1.27.4-1) + +mediawiki (1:1.27.3-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Kunal Mehta <[email protected]> Mon, 01 May 2017 15:27:58 -0700 mediawiki (1:1.27.3-1) unstable; urgency=medium -- To view, visit https://gerrit.wikimedia.org/r/391617 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88ed1194c4d8e2e3214753cf24abff500156adaa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: jessie Gerrit-Owner: Legoktm <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
