Merge branch 'setup_colors' into setup_app_name
[pub/Android/ownCloud.git] / res / values-fr /
drwxr-xr-x   ..
-rw-r--r-- 24686 strings.xml