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