Merge pull request #6697 from nextcloud/backport/6696/stable-3.13
authorallexzander <allexzander@users.noreply.github.com>
Thu, 25 Apr 2024 14:58:09 +0000 (16:58 +0200)
committerGitHub <noreply@github.com>
Thu, 25 Apr 2024 14:58:09 +0000 (16:58 +0200)
commit286e65d1fc1ad59db2fc75b32333a2ec9ece3273
tree31fa50514626dece35078362036153194af8b865
parentff15cec4d2504ff3d15be5ca024f5d9a8cb20fc2
parent54acd3498f92e9bbdd62c000d2ca127b1dff5e48
Merge pull request #6697 from nextcloud/backport/6696/stable-3.13

[stable-3.13] Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows.