From: Olivier Goffart <ogoffart@woboq.com>
Date: Thu, 13 Apr 2017 08:19:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/2.3'
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~773
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ed4eb46f20793b7f0742f4c058f6ce20de9515a;p=nextcloud-desktop.git

Merge remote-tracking branch 'origin/2.3'

 Conflicts:
	VERSION.cmake
---

1ed4eb46f20793b7f0742f4c058f6ce20de9515a