Merge branch 'develop' into update_propfind_for_server_8.1
[pub/Android/ownCloud.git] / oc_jb_workaround / res / values /
drwxr-xr-x   ..
-rw-r--r-- 922 setup.xml