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