Merge branch 'develop' into loging_different_servers_same_pattern
[pub/Android/ownCloud.git] / res / values-io /
drwxr-xr-x   ..
-rw-r--r-- 215 strings.xml