Nmc/2346 file conflict#390

harshada-15-tsys wants to merge 3 commits into

masternextmcloud/ios:masterfrom

nmc/2346-File_conflictnextmcloud/ios:nmc/2346-File_conflictCopy head branch name to clipboard