Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
[pub/Android/ownCloud.git] / res / values-km /
drwxr-xr-x   ..
-rw-r--r-- 7718 strings.xml