Merge pull request #2144 from nextcloud/fix_e2ee_upload_lock_starvation
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 1 Jul 2020 17:22:45 +0000 (19:22 +0200)
committerGitHub <noreply@github.com>
Wed, 1 Jul 2020 17:22:45 +0000 (19:22 +0200)
Fix e2ee upload lock starvation


Trivial merge