From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Wed, 20 May 2020 08:48:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into traywindow-listview-actions
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~198^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e9a82dff7798d2cb15dcf13680c4c39783ed480b;p=nextcloud-desktop.git

Merge remote-tracking branch 'origin/master' into traywindow-listview-actions

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

e9a82dff7798d2cb15dcf13680c4c39783ed480b