Merge pull request #820 from owncloud/obeySortOrder_fixmerge
[pub/Android/ownCloud.git] / res / values-fr /
drwxr-xr-x   ..
-rw-r--r-- 25736 strings.xml