From: masensio <masensio@solidgear.es>
Date: Mon, 22 Jun 2015 12:03:21 +0000 (+0200)
Subject: Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
X-Git-Tag: oc-android-1.7.2~1^2~13^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2fbd757d66a24a3be234994ae175cf211b68d1ff

Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads

Conflicts:
	owncloud-android-library
---

2fbd757d66a24a3be234994ae175cf211b68d1ff
diff --cc owncloud-android-library
index a22b1da1,ff85ff2e..8f87ad78
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a22b1da16b16a759d260d950fcd246d8527fbf00
 -Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a
++Subproject commit 8f87ad78f752fd44c419d1595482247cae5d056b