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