fix: offer only keep both and skip for upload conflicts between file and folder - #3735

fix: offer only keep both and skip for upload conflicts between file and folder#3735

AlexAndBear merged 7 commits into

mainopencloud-eu/web:mainfrom

fix/upload-file-vs-folderopencloud-eu/web:fix/upload-file-vs-folderCopy head branch name to clipboard