From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sat, 28 Nov 2015 10:51:37 +0000 (+0100)
Subject: added PR 1220
X-Git-Tag: beta-20151129~2^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/023ffebc64277b2628b7c2c88a0424d686844dbf?ds=inline;hp=--cc

added PR 1220
---

023ffebc64277b2628b7c2c88a0424d686844dbf
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 992ab777..739f0575 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - update all PR
 - PR [#1191] (https://github.com/owncloud/android/pull/1191) "Cancel upload on wlan exit" merged
+- PR [#1220] (https://github.com/owncloud/android/pull/1220) "Move to compile target Marshmallow (Android 6 - v23)" merged
 
 # 2015-11-21
 - fix #1297