[stable-3.35.x] Nmc/1901 Conflict dialog - #616

[stable-3.35.x] Nmc/1901 Conflict dialog#616

github-actions[bot] wants to merge 1 commit into

stable-3.35.xnextmcloud/android:stable-3.35.xfrom

backport/nmc/62/stable-3.35.xnextmcloud/android:backport/nmc/62/stable-3.35.xCopy head branch name to clipboard