Legoktm has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351206 )
Change subject: Merge branch 'master' into xenial
......................................................................
Merge branch 'master' into xenial
Change-Id: I6fc7227c020ac824f294894ebe7b5707868be97c
---
M debian/changelog
1 file changed, 9 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 36d3cd4..fbf8104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,21 @@
-<<<<<<< HEAD (93689b Merge tag 'debian/1%1.27.2-1' into xenial)
-mediawiki (1:1.27.2-1ppa1~xenial1) xenial; urgency=medium
+mediawiki (1:1.27.3-1ppa1~xenial1) xenial; urgency=medium
* Rebuild for xenial
- -- Kunal Mehta <lego...@member.fsf.org> Sat, 08 Apr 2017 13:29:11 -0700
-=======
+ -- Kunal Mehta <lego...@member.fsf.org> Mon, 01 May 2017 15:32:31 -0700
+
mediawiki (1:1.27.3-1) unstable; urgency=medium
* Imported Upstream version 1.27.3 (security release), that
actually contains the fix for CVE-2017-0372 (Closes: #861585)
-- Kunal Mehta <lego...@member.fsf.org> Mon, 01 May 2017 13:20:11 -0700
->>>>>>> BRANCH (234be1 Update changelog for 1.27.3)
+
+mediawiki (1:1.27.2-1ppa1~xenial1) xenial; urgency=medium
+
+ * Rebuild for xenial
+
+ -- Kunal Mehta <lego...@member.fsf.org> Sat, 08 Apr 2017 13:29:11 -0700
mediawiki (1:1.27.2-1) unstable; urgency=medium
--
To view, visit https://gerrit.wikimedia.org/r/351206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6fc7227c020ac824f294894ebe7b5707868be97c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: xenial
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
