From: marcohald <marcohald@users.noreply.github.com>
Date: Fri, 12 Feb 2021 14:19:34 +0000 (+0100)
Subject: Merge branch 'master' into master
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~364^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6032f2baef0d22fcf90664f85e1387cb64c2351f;p=nextcloud-desktop.git

Merge branch 'master' into master
---

6032f2baef0d22fcf90664f85e1387cb64c2351f