Merge branch 'develop' into pincode_request_is_not_starting_when_rotating
[pub/Android/ownCloud.git] / automationTest / resources /
drwxr-xr-x   ..
-rw-r--r-- 70 .gitignore