Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
[pub/Android/ownCloud.git] / tests / .settings /
drwxr-xr-x   ..
-rw-r--r-- 726 org.eclipse.jdt.core.prefs