Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
authormasensio <masensio@solidgear.es>
Mon, 22 Jun 2015 12:03:21 +0000 (14:03 +0200)
committermasensio <masensio@solidgear.es>
Mon, 22 Jun 2015 12:03:21 +0000 (14:03 +0200)
commit2fbd757d66a24a3be234994ae175cf211b68d1ff
tree7062a0f73adcb651b396074d583b6e477baed1a8
parente7710e7383b344994b03d0c47916d771cdc282d9
parent8981be0c716430d58ac00955c6b1db367e60efcd
Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads

Conflicts:
owncloud-android-library
owncloud-android-library