From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Tue, 9 May 2017 16:23:01 +0000 (+0200)
Subject: Merge branch 2.3 into master
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~742
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4d3212b31ffda405d32b4c82fb36fe2639ce6936;p=nextcloud-desktop.git

Merge branch 2.3 into master
---

4d3212b31ffda405d32b4c82fb36fe2639ce6936