From: Roeland Jago Douma <rullzer@users.noreply.github.com>
Date: Fri, 12 Apr 2019 11:48:19 +0000 (+0200)
Subject: Merge branch 'master' into tintou/i18n
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~279^2^2~63^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=088b0817d819bf9a5c1faf12ca6b241d0e6d11b6;p=nextcloud-desktop.git

Merge branch 'master' into tintou/i18n
---

088b0817d819bf9a5c1faf12ca6b241d0e6d11b6