From: Michael Schuster <48932272+misch7@users.noreply.github.com>
Date: Thu, 7 Nov 2019 14:49:43 +0000 (+0100)
Subject: Merge branch 'master' into qt5.5-compat
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~547^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c6279f86a499af350be0e650417b947ef7c8eda;p=nextcloud-desktop.git

Merge branch 'master' into qt5.5-compat
---

0c6279f86a499af350be0e650417b947ef7c8eda