Merge branch 'develop' into share_link__unshare_file
[pub/Android/ownCloud.git] / res / values-ca /
drwxr-xr-x   ..
-rw-r--r-- 19156 strings.xml