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