Merge branch 'master' into sync_full_folder
[pub/Android/ownCloud.git] / src / com / owncloud /
drwxr-xr-x   ..
drwxr-xr-x - android