From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 29 Nov 2015 13:39:21 +0000 (+0100)
Subject: merge resiceCache
X-Git-Tag: beta-20151129~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/42543575c04faefb0ca5da5c847124662b026e6a?ds=inline;hp=--cc

merge resiceCache
try to fix 1315
---

42543575c04faefb0ca5da5c847124662b026e6a
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3c106d1c..47528871 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="20151128"
+    android:versionCode="20151129"
     android:versionName="ownCloud beta" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-sdk
diff --git a/android-release.apk b/android-release.apk
new file mode 100644
index 00000000..570f4db2
Binary files /dev/null and b/android-release.apk differ
diff --git a/apks/latest b/apks/latest
index 63174050..79b90d07 100644
--- a/apks/latest
+++ b/apks/latest
@@ -1 +1 @@
-20151128
+20151129
diff --git a/apks/owncloud-beta-20151120.apk b/apks/owncloud-beta-20151120.apk
deleted file mode 100644
index 056d0ecc..00000000
Binary files a/apks/owncloud-beta-20151120.apk and /dev/null differ
diff --git a/apks/owncloud-beta-20151129.apk b/apks/owncloud-beta-20151129.apk
new file mode 100644
index 00000000..271ec0d8
Binary files /dev/null and b/apks/owncloud-beta-20151129.apk differ
diff --git a/build.gradle b/build.gradle
index ccfce0d9..a5906114 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ android {
 
     defaultConfig {
         applicationId "com.owncloud.android.beta"
-        versionCode 20151128
+        versionCode 20151129
         versionName "ownCloud beta"
     }