projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4dd2221e2ba7f0356315a672f27a1e6eb4bbae3c
tree39927669dd35fff7c0ac2babe72d579530589376tree | snapshot
parentd2d9de790f6dc600a2bd9c0de953d4a11f5b634bcommit | diff
parent50ffc7373fd4f0cd645343622754ff55f4350a49commit | diff
Merge pull request #5293 from nextcloud/bugfix/do-not-generate-conflict-when-locking-and-unlocking

Update file's metadata in the local database when the etag changes while file remains unchanged. Fix subsequent conflict when locking and unlocking.
Unnamed repository; edit this file 'description' to name the repository.