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