From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 22 Jun 2015 09:23:05 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.2~1^2~14
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8981be0c716430d58ac00955c6b1db367e60efcd?hp=a860ff6f96777af42687fa727d9093d3edf2c4d6

Merge branch 'master' into develop

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51d52429..308e8a7d 100644
--- a/CHANGELOG.md
+++ b/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
-...
+
 
 
diff --git a/owncloud-android-library b/owncloud-android-library
index 344d5b22..ff85ff2e 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 344d5b22e43021ebc54f18ad7d17b1702dfa406c
+Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a