]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31ecdfb 069870a)
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)
[stable17] 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