From: tuxmaster5000 <837503+tuxmaster5000@users.noreply.github.com>
Date: Tue, 16 Oct 2018 07:35:33 +0000 (+0200)
Subject: Merge branch 'master' into owncloud
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~662^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ddf1ac04e58f023c0d24ef1b50a99945f97c84b9;p=nextcloud-desktop.git

Merge branch 'master' into owncloud
---

ddf1ac04e58f023c0d24ef1b50a99945f97c84b9