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?hp=2fbd757d66a24a3be234994ae175cf211b68d1ff

Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads

Conflicts:
	owncloud-android-library
---