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