From 02ee5b079c95774656d0283977f8aeb463a447e0 Mon Sep 17 00:00:00 2001
From: "Philipp C. Heckel" <philipp.heckel@gmail.com>
Date: Thu, 4 Sep 2014 19:31:40 +0200
Subject: [PATCH] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83eaef592..75b66451f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ Change Log
 
 ### Syncany 0.1.10-alpha (Date: Tbd.)
 - Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- Features and significant changes:
+  + Combined `sy` and `syd` script into one #210
+  + Add folder to daemon config in `sy init` #215/#153
 - Bugfixes and other things:
   + Fix daemon tests #185