Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
[pub/Android/ownCloud.git] / automationTest / resources /
drwxr-xr-x   ..
-rw-r--r-- 70 .gitignore