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