From: Roeland Jago Douma <rullzer@users.noreply.github.com>
Date: Wed, 6 May 2020 19:50:49 +0000 (+0200)
Subject: Merge pull request #20841 from nextcloud/trashbin-locking
X-Git-Tag: v19.0.0RC1~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a07c21f63006a9eec5e6ad549ed17d9702c2cbb2;p=nextcloud-server.git

Merge pull request #20841 from nextcloud/trashbin-locking

add locking to resolve concurent move to trashbin conflicts
---

a07c21f63006a9eec5e6ad549ed17d9702c2cbb2