Merge branch 'develop' into release-1.6.0
[pub/Android/ownCloud.git] / res / values-is /
drwxr-xr-x   ..
-rw-r--r-- 1411 strings.xml