[stable-35.0.x] Nmc/1901 Conflict dialog - #646

[stable-35.0.x] Nmc/1901 Conflict dialog#646

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

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

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