From: Michael Schuster <48932272+misch7@users.noreply.github.com>
Date: Thu, 17 Oct 2019 20:05:20 +0000 (+0200)
Subject: Merge branch 'master' into feature/remote-wipe
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~595^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=32bb31a417fd4c782c1d463c1c56313921ddda43;p=nextcloud-desktop.git

Merge branch 'master' into feature/remote-wipe
---

32bb31a417fd4c782c1d463c1c56313921ddda43