Merge pull request #2781 from nextcloud/cherry_pick_2020_w53
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 30 Dec 2020 18:00:19 +0000 (19:00 +0100)
committerGitHub <noreply@github.com>
Wed, 30 Dec 2020 18:00:19 +0000 (19:00 +0100)
commitfbd9f5126c2846d31cdf0cd888aeb5c110789d8a
treea9a45f4410b031bd282f4632c0f56b1b3ffc5b02
parentc501eed365e92d11ef69515cc73807edfb75fca7
parent09cc988026f37f9f9a525437c418c02207f5493b
Merge pull request #2781 from nextcloud/cherry_pick_2020_w53

Cherry pick 2020 w53