From: Ivan Čukić <ivan-cukic@users.noreply.github.com>
Date: Mon, 3 Jun 2019 07:11:56 +0000 (+0200)
Subject: Merge branch 'master' into ivan/encryption-initial-setup
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~279^2^2~9^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=200032c9cb4f971ffb0815e61e02b4bdd31f4a7e;p=nextcloud-desktop.git

Merge branch 'master' into ivan/encryption-initial-setup
---

200032c9cb4f971ffb0815e61e02b4bdd31f4a7e