Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
[pub/Android/ownCloud.git] / automationTest / resources /
drwxr-xr-x   ..
-rw-r--r-- 70 .gitignore