From: Michael Schuster <48932272+misch7@users.noreply.github.com>
Date: Wed, 17 Jun 2020 15:35:07 +0000 (+0200)
Subject: Merge branch 'master' into patch-1
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~147^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb78789300e1d9b822a591b74473c02a028d88f1;p=nextcloud-desktop.git

Merge branch 'master' into patch-1
---

bb78789300e1d9b822a591b74473c02a028d88f1