Merge pull request #5777 from nextcloud/backport/5766/stable-3.9
authorCamila <hello@camila.codes>
Wed, 7 Jun 2023 10:09:59 +0000 (07:09 -0300)
committerGitHub <noreply@github.com>
Wed, 7 Jun 2023 10:09:59 +0000 (07:09 -0300)
[stable-3.9] Bugfix. Conflict resolution button not clickable.


Trivial merge