From 5e452aa07df3aae8b0cf68b3ef466baacbb6a414 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alexandre.aubin@cern.ch>
Date: Mon, 28 May 2018 02:31:05 +0200
Subject: [PATCH] Update changelog

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dc6c6276b..a0992251a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yunohost (3.0.0~beta1.4) testing; urgency=low
+
+  * Merge with jessie's branches
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Mon, 28 May 2018 02:30:00 +0000
+
 yunohost (3.0.0~beta1.3) testing; urgency=low
 
   * Use mariadb 10.1 now