Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338348 )
Change subject: Merge tag 'debian/1%1.27.1-3_bpo8+1' into trusty ...................................................................... Merge tag 'debian/1%1.27.1-3_bpo8+1' into trusty mediawiki Debian release 1:1.27.1-3~bpo8+1 Change-Id: I17773044e89714dbaf2e3594d3f8384b5fe436b4 --- M debian/changelog 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/48/338348/1 diff --git a/debian/changelog b/debian/changelog index 63ccf5b..af604e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -<<<<<<< HEAD (56726e Rebuild for trusty) -mediawiki (1:1.27.1-2ppa2~trusty1) trusty; urgency=medium +mediawiki (1:1.27.1-3ppa1~trusty1) trusty; urgency=medium * Rebuild for trusty - -- Kunal Mehta <lego...@member.fsf.org> Sun, 18 Sep 2016 00:08:55 -0700 -======= + -- Kunal Mehta <lego...@member.fsf.org> Fri, 17 Feb 2017 04:50:19 -0800 + mediawiki (1:1.27.1-3~bpo8+1) jessie-backports; urgency=medium * Rebuild for jessie-backports. @@ -26,7 +25,12 @@ * Add Provides for extensions now included in this one (Closes: #845281) -- Kunal Mehta <lego...@member.fsf.org> Tue, 13 Sep 2016 04:17:42 -0700 ->>>>>>> BRANCH (176c62 Merge tag 'debian/1%1.27.1-3' into jessie) + +mediawiki (1:1.27.1-2ppa2~trusty1) trusty; urgency=medium + + * Rebuild for trusty + + -- Kunal Mehta <lego...@member.fsf.org> Sun, 18 Sep 2016 00:08:55 -0700 mediawiki (1:1.27.1-2~bpo8+1) jessie-backports; urgency=medium -- To view, visit https://gerrit.wikimedia.org/r/338348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17773044e89714dbaf2e3594d3f8384b5fe436b4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: trusty Gerrit-Owner: Legoktm <lego...@member.fsf.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
