Skip to content

Commit 737bfbf

Browse files
Merge pull request #16625 from nextcloud/refactor/conflict-resolve-activity
refactor(conflict-resolve-activity)
2 parents 7ac934e + 05cf811 commit 737bfbf

File tree

1 file changed

+133
-182
lines changed

1 file changed

+133
-182
lines changed

0 commit comments

Comments
 (0)