Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads

author masensio <masensio@solidgear.es>

Mon, 22 Jun 2015 12:03:21 +0000 (14:03 +0200)

committer masensio <masensio@solidgear.es>

Mon, 22 Jun 2015 12:03:21 +0000 (14:03 +0200)
author masensio <masensio@solidgear.es>
Mon, 22 Jun 2015 12:03:21 +0000 (14:03 +0200)
committer masensio <masensio@solidgear.es>
Mon, 22 Jun 2015 12:03:21 +0000 (14:03 +0200)
diff --combined owncloud-android-library

index a22b1da,ff85ff2..8f87ad7
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a22b1da16b16a759d260d950fcd246d8527fbf00
- -Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a
++Subproject commit 8f87ad78f752fd44c419d1595482247cae5d056b
author	masensio <masensio@solidgear.es>
	Mon, 22 Jun 2015 12:03:21 +0000 (14:03 +0200)
committer	masensio <masensio@solidgear.es>
	Mon, 22 Jun 2015 12:03:21 +0000 (14:03 +0200)