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