Merge branch 'develop' into enforce_folder_refresh_even_though_etag_is_not_updated_in...
[pub/Android/ownCloud.git] / res / layout-land /
drwxr-xr-x   ..
-rw-r--r-- 7456 account_setup.xml