Merge branch 'develop' into instant_uploads_set_path
[pub/Android/ownCloud.git] / oc_jb_workaround / .settings /
drwxr-xr-x   ..
-rw-r--r-- 173 org.eclipse.jdt.core.prefs