From cad227d13c8578c65ccbc36f7f2e2e94adbf838f Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Fri, 18 Nov 2016 00:04:47 +0100
Subject: [PATCH] Updated changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d45e94..1e383c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,9 @@ dd MMM 2016: osync v1.2-beta3 released
         - Added skip-deletion tests
 	- Added configuration file tests
 	- Added upgrade script test
+	- Added basic daemon mode tests
 - Simplified logger
+- All fixes from v1.1.5
 
 17 Oct 2016: osync v1.2-beta2 released
 - osync now propagates symlink deletions and moves symlinks without referrents to deletion dir