From 407effed396a23d956f4756b0ce40ae008d5695d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 21 Nov 2018 12:27:12 +0100
Subject: [PATCH] merge branch master & adapt changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35bc9a1c9..519fdfeca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,8 @@ Version 1.5.4
 
 - adding indexes on place event and task
 
-Branche de développement
-========================
+Version 1.5.5
+=============
 
 - Fix error on the "see more" link which was not showed
 - Layout of the task list