From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 4 Jan 2016 11:38:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/2.1'
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1385
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=639301e9e986aa7d12c178a486773ed9449e1361;p=nextcloud-desktop.git

Merge remote-tracking branch 'origin/2.1'

 Conflicts:
	VERSION.cmake
---

639301e9e986aa7d12c178a486773ed9449e1361