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