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