Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
[pub/Android/ownCloud.git] / automationTest / .settings /
drwxr-xr-x   ..
-rw-r--r-- 652 org.eclipse.jdt.core.prefs
-rw-r--r-- 86 org.eclipse.m2e.core.prefs