summaryrefslogtreecommitdiffstats
path: root/apps/settings/webpack.js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-05-25 21:31:36 +0200
committerGitHub <noreply@github.com>2020-05-25 21:31:36 +0200
commitde1cbad0ee8338391d01c4778166bd31bb75c978 (patch)
tree8a1996614e3d452c76f1e4dc41c13b858f2235e0 /apps/settings/webpack.js
parent1d816add44fb0058d1fd927585a4e894c1d39132 (diff)
parentc04fc3a732ec7fa786cbd813b18caa8c3106e698 (diff)
downloadnextcloud-server-de1cbad0ee8338391d01c4778166bd31bb75c978.tar.gz
nextcloud-server-de1cbad0ee8338391d01c4778166bd31bb75c978.zip
Merge pull request #20881 from nextcloud/backport/20841/stable18
[stable18] add locking to resolve concurent move to trashbin conflicts
Diffstat (limited to 'apps/settings/webpack.js')
0 files changed, 0 insertions, 0 deletions