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)
commit20bd460bec184d86ef4b77c5abac1943e873ac40
treed8d5942bef00028a1235a4ed9477366289f3f876
parent21c5decc04d83fa49403ef01cb80451b98774c96
parent2fb2535c6bd7b544b03136f1e3a677a40aad7ffa
Merge pull request #5777 from nextcloud/backport/5766/stable-3.9

[stable-3.9] Bugfix. Conflict resolution button not clickable.