]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07f4167 614acc9)
Merge pull request #20841 from nextcloud/trashbin-locking
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Wed, 6 May 2020 19:50:49 +0000 (21:50 +0200)
committerGitHub <noreply@github.com>
Wed, 6 May 2020 19:50:49 +0000 (21:50 +0200)
add locking to resolve concurent move to trashbin conflicts


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server