]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2d9de7 50ffc73)
Merge pull request #5293 from nextcloud/bugfix/do-not-generate-conflict-when-locking...
authorallexzander <allexzander@users.noreply.github.com>
Fri, 30 Dec 2022 16:32:10 +0000 (17:32 +0100)
committerGitHub <noreply@github.com>
Fri, 30 Dec 2022 16:32:10 +0000 (17:32 +0100)
Update file's metadata in the local database when the etag changes while file remains unchanged. Fix subsequent conflict when locking and unlocking.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.