merge resiceCache

try to fix 1315

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3c106d1..4752887 100644 (file)
--- 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 (file)
index 0000000..570f4db
Binary files /dev/null and b/android-release.apk differ

diff --git a/apks/latest b/apks/latest
index 6317405..79b90d0 100644 (file)
--- 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 (file)
index 056d0ec..0000000
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 (file)
index 0000000..271ec0d
Binary files /dev/null and b/apks/owncloud-beta-20151129.apk differ

diff --git a/build.gradle b/build.gradle
index ccfce0d..a590611 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ android {
 
     defaultConfig {
         applicationId "com.owncloud.android.beta"
-        versionCode 20151128
+        versionCode 20151129
         versionName "ownCloud beta"
     }