]> source.dussan.org Git - nextcloud-server.git/commit
Merge pull request #20882 from nextcloud/backport/20841/stable17
authorMorris Jobke <hey@morrisjobke.de>
Fri, 15 May 2020 12:55:15 +0000 (14:55 +0200)
committerGitHub <noreply@github.com>
Fri, 15 May 2020 12:55:15 +0000 (14:55 +0200)
commitbccec95a96c15e3823c767be3420da3557e27d4b
tree719b33c568d70490a3f60fe69e81cf9ab6ecb33e
parent31ecdfb196b1a1db3e4ad365e2fce5f72c7dd766
parent069870a82fd454b7811c7739755fd249e13d6f02
Merge pull request #20882 from nextcloud/backport/20841/stable17

[stable17] add locking to resolve concurent move to trashbin conflicts