Merge branch 'develop' into release-1.5.8
[pub/Android/ownCloud.git] / res / drawable / uploading_file_indicator.png
res/drawable/uploading_file_indicator.png