From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 08:40:30 +0000 (+0100)
Subject: update pr
X-Git-Tag: beta-20151122~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c00d952cdc41342723ba4b124708fe4493baf4b1?ds=inline;hp=--cc

update pr
---

c00d952cdc41342723ba4b124708fe4493baf4b1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97ea0e30..4d21e5dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2015-11-21
+- fix #1297
+- update all PR
+
 # 2015-11-20
 - PR [#1293] (https://github.com/owncloud/android/pull/1293) "External SD by przybylski" merged
 - PR [#1296] (https://github.com/owncloud/android/pull/1296) "Don't allow to remove passcode without entering it. Don't allow to set incomplete passcode by przybylski" merged
diff --git a/apks/latest b/apks/latest
index 7ed440b2..b8f9aede 100644
--- a/apks/latest
+++ b/apks/latest
@@ -1 +1 @@
-20151120
+20151121
diff --git a/apks/owncloud-beta-20151121.apk b/apks/owncloud-beta-20151121.apk
new file mode 100644
index 00000000..ce78ff9e
Binary files /dev/null and b/apks/owncloud-beta-20151121.apk differ
diff --git a/owncloud-android-library b/owncloud-android-library
index ecc3415e..4f9a7528 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199
+Subproject commit 4f9a7528cab0563cb234a8b817e8ee371dd6cc25