Merge branch 'develop' into regular_authentication_in_saml_server
[pub/Android/ownCloud.git] / res / values-ug /
drwxr-xr-x   ..
-rw-r--r-- 2507 strings.xml