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)
[stable-3.13] Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows.


Trivial merge