From: Michael Schuster <48932272+misch7@users.noreply.github.com>
Date: Wed, 17 Jun 2020 22:44:52 +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
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=93404c6c1b3ead9080294f8233d164fca168c514;p=nextcloud-desktop.git

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

93404c6c1b3ead9080294f8233d164fca168c514