Skip to content
Unverified Commit bccec95a authored by Morris Jobke's avatar Morris Jobke Committed by GitHub
Browse files

Merge pull request #20882 from nextcloud/backport/20841/stable17 

[stable17] add locking to resolve concurent move to trashbin conflicts
parents 31ecdfb1 069870a8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment