Tim Starling has uploaded a new change for review. https://gerrit.wikimedia.org/r/325429
Change subject: Merge branch 'debian' into debian-trusty ...................................................................... Merge branch 'debian' into debian-trusty Change-Id: I50e41157b4819e7ce553b28485ba2052723bf508 --- M debian/changelog 1 file changed, 6 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/html5depurate refs/changes/29/325429/1 diff --git a/debian/changelog b/debian/changelog index fee450c..baa2939 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,15 @@ -<<<<<<< HEAD (522479 Changelog for package 1.1.4~trusty) -html5depurate (1.1.4~trusty) unstable; urgency=medium - - * Backport to trusty - - -- Tim Starling <[email protected]> Fri, 02 Dec 2016 10:27:50 +1100 -======= html5depurate (1.1.5) unstable; urgency=medium * Fix bug with incorrect reset of output streams during tag stack split (patch by Subramanya Sastry) -- Tim Starling <[email protected]> Tue, 06 Dec 2016 09:15:27 +1100 ->>>>>>> BRANCH (a4577d Changelog for package version 1.1.5) + +html5depurate (1.1.4~trusty) unstable; urgency=medium + + * Backport to trusty + + -- Tim Starling <[email protected]> Fri, 02 Dec 2016 10:27:50 +1100 html5depurate (1.1.4) unstable; urgency=medium -- To view, visit https://gerrit.wikimedia.org/r/325429 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50e41157b4819e7ce553b28485ba2052723bf508 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/html5depurate Gerrit-Branch: debian-trusty Gerrit-Owner: Tim Starling <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
