Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
[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