Merge branch 'master' into sync_full_folder
[pub/Android/ownCloud.git] / res / drawable / conflict_file_indicator.png
res/drawable/conflict_file_indicator.png