From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Sun, 19 Jan 2020 19:44:50 +0000 (+0100)
Subject: Merge branch 'master' into resource-cleanup
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~344^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb757c6a27a5c2683bc9d0a341e5fc795ef83877;p=nextcloud-desktop.git

Merge branch 'master' into resource-cleanup

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
---

bb757c6a27a5c2683bc9d0a341e5fc795ef83877