From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 3 Mar 2017 09:57:23 +0000 (+0100)
Subject: Merge branch '2.3'
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~797
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=13df7fcee0a2ef745eeed80cb8129b199ba9554c;p=nextcloud-desktop.git

Merge branch '2.3'

 Conflicts:
	src/libsync/owncloudpropagator.cpp
---

13df7fcee0a2ef745eeed80cb8129b199ba9554c