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