Bläddra i källkod

Merge branch 'master' into develop

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
David A. Velasco 9 år sedan
förälder
incheckning
8981be0c71
2 ändrade filer med 14 tillägg och 3 borttagningar
  1. 13 2
      CHANGELOG.md
  2. 1 1
      owncloud-android-library

+ 13 - 2
CHANGELOG.md

@@ -1,4 +1,15 @@
-## 1.7.0 (19 February 2015)
+
+## 1.7.1 (April 2015)
+
+- Share link even with password enforced by server
+- Get the app ready for oc 8.1 servers
+- Added option to create new folder in uploads from external apps
+- Improved management of deleted users
+- Bugs fixed
+  + Fixed crash on Android 2.x devices
+  + Improvements on uploads
+
+## 1.7.0 (February 2015)
 
 - Download full folders
 - Grid view for images
@@ -15,6 +26,6 @@
 - Settings view updated
 - Improved subjects in e-mails
 - Bugs fixed
-...
+
 
 

+ 1 - 1
owncloud-android-library

@@ -1 +1 @@
-Subproject commit 344d5b22e43021ebc54f18ad7d17b1702dfa406c
+Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a