Updated changelog

7 years ago · f962f86f30
parent 2c1e688d8e
commit f962f86f30
1 changed files with 7 additions and 0 deletions
--- 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