From f7d168a7ab7bf526d0d040cb319846e915fd9176 Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Tue, 6 Jun 2017 16:01:25 +0200
Subject: [PATCH] Updated changelog

---
 CHANGELOG.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d803479..9030532 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,10 @@
 RECENT CHANGES
 --------------
 
-dd Mmm YYYY: osync v1.2.2. release
-
-! Added an option to log conflictual files
-! Presence of conflictual files can trigger a special mail
-! new option FORCE_CONFLICT_PREVALANCE
-
 dd Mmm YYYY: osync v1.2.1 release
 
 - Added --no-resume option in order to disable resuming execution on failure
+- Fixed an issue with filenames ending with spaces, their deletion not being propagated, and ACL / conflicts not being managed (still they got synced)
 - Fixed missing options passed to subprocess in daemon mode
 - Fixed bogus pgrep can lead to segfault 11 because of recursive KillChilds
 - Fixed osync deletion not working on systems with ssh banner enabled