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