Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/347145 )

Change subject: Merge tag 'debian/1%1.27.2-1' into jessie
......................................................................

Merge tag 'debian/1%1.27.2-1' into jessie

Change-Id: Ie17cff9263fe18d6694a8234cc334a140ce5e5bb
---
M debian/changelog
1 file changed, 10 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/45/347145/1

diff --git a/debian/changelog b/debian/changelog
index 2bc5464..85c780b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-<<<<<<< HEAD   (176c62 Merge tag 'debian/1%1.27.1-3' into jessie)
-mediawiki (1:1.27.1-3~bpo8+1) jessie-backports; urgency=medium
+mediawiki (1:1.27.2-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
-  * Dropped default-mysql-server recommendation
 
- -- Kunal Mehta <[email protected]>  Fri, 23 Dec 2016 15:45:22 -0800
-=======
+ -- Kunal Mehta <[email protected]>  Sat, 08 Apr 2017 08:37:49 +0000
+
 mediawiki (1:1.27.2-1) unstable; urgency=medium
 
   * Improve NEWS file (Closes: #852862, #854352)
@@ -15,7 +13,13 @@
     CVE-2017-0369, CVE-2017-0367, CVE-2017-0372
 
  -- Kunal Mehta <[email protected]>  Thu, 06 Apr 2017 14:04:24 -0700
->>>>>>> BRANCH (d9222c Update changelog for 1.27.2 release)
+
+mediawiki (1:1.27.1-3~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+  * Dropped default-mysql-server recommendation
+
+ -- Kunal Mehta <[email protected]>  Fri, 23 Dec 2016 15:45:22 -0800
 
 mediawiki (1:1.27.1-3) unstable; urgency=medium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/347145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie17cff9263fe18d6694a8234cc334a140ce5e5bb
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

Reply via email to