From: Camila Ayres <hello@camila.codes>
Date: Mon, 22 Jul 2019 18:45:50 +0000 (+0200)
Subject: Merge branch 'master' into fixes-1187
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2~2^2~241^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a47dd69a71f15366c78800ad7216e7599bd09f9e;p=nextcloud-desktop.git

Merge branch 'master' into fixes-1187
---

a47dd69a71f15366c78800ad7216e7599bd09f9e