Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
[pub/Android/ownCloud.git] / res / values-zh-rCN /
drwxr-xr-x   ..
-rw-r--r-- 21984 strings.xml