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