From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 31 Aug 2015 12:34:04 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1596
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=950bc578d0ba7bff520f365137f19b9b7dd7efbe;p=nextcloud-desktop.git

Merge branch '2.0'
---

950bc578d0ba7bff520f365137f19b9b7dd7efbe