Merge remote-tracking branch 'remotes/upstream/master' into beta
[pub/Android/ownCloud.git] / res / values-fr /
drwxr-xr-x   ..
-rw-r--r-- 29139 strings.xml