Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
[pub/Android/ownCloud.git] / src / com / owncloud /
drwxr-xr-x   ..
drwxr-xr-x - android