Fixed conflict - Merge branch 'develop' into better_loggin_system
[pub/Android/ownCloud.git] / res / values-fr /
drwxr-xr-x   ..
-rw-r--r-- 22058 strings.xml