From: Camila Ayres <smayres@gmail.com>
Date: Sun, 14 Oct 2018 14:13:01 +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~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa388b86c0ff298950410c455f083399e4664d2e;p=nextcloud-desktop.git

Merge branch 'master' into owncloud
---

aa388b86c0ff298950410c455f083399e4664d2e