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)
Conflicts:
owncloud-android-library


No differences found