From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 17:34:28 +0000 (+0100)
Subject: merged pr #1205
X-Git-Tag: beta-20151122~87
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a8df1430c3666119cde2c1d445d49cd32559aa3f?hp=--cc

merged pr #1205
---

a8df1430c3666119cde2c1d445d49cd32559aa3f
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6251604c..88183ad6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 - PR [#1099](https://github.com/owncloud/android/pull/1099) "Switch list vs grid" merged
 - PR [#1100](https://github.com/owncloud/android/pull/1100) "Material FAB with speed dial implementation" merged
 - PR [#1209](https://github.com/owncloud/android/pull/1209) "Material buttons - before in #1090" merged
+- PR [#1205](https://github.com/owncloud/android/pull/1205) "Switch between online and offline files" merged
 
 
 # 2015-10-26