From f962f86f30a112e0e28e5c990a0a49096748a0d4 Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Tue, 30 May 2017 10:09:19 +0200
Subject: [PATCH] Updated changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 030937b..bd69b24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,15 @@
 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
 
+- 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
 - Added basic performance profiler to debug version