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

Merge branch 'master' into qml-singleton-style

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

6593317afa50d6058b45a0afc501c9697a4a1db3