Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351205 )

Change subject: Merge branch 'master' into jessie
......................................................................


Merge branch 'master' into jessie

Change-Id: I1eff6c3516951f1939ea2f9789ecb00729df53a5
---
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 e55b6d6..c762bed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,21 @@
-<<<<<<< HEAD   (a4db6b Merge tag 'debian/1%1.27.2-1' into jessie)
-mediawiki (1:1.27.2-1~bpo8+1) jessie-backports; urgency=medium
+mediawiki (1:1.27.3-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
 
- -- Kunal Mehta <lego...@member.fsf.org>  Sat, 08 Apr 2017 08:37:49 +0000
-=======
+ -- Kunal Mehta <lego...@member.fsf.org>  Mon, 01 May 2017 15:27:58 -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-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Kunal Mehta <lego...@member.fsf.org>  Sat, 08 Apr 2017 08:37:49 +0000
 
 mediawiki (1:1.27.2-1) unstable; urgency=medium
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1eff6c3516951f1939ea2f9789ecb00729df53a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: jessie
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

Reply via email to