From: Klaas Freitag <freitag@owncloud.com>
Date: Thu, 29 Oct 2015 15:34:15 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1473
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=46269dac4eb9ce78a7bfc77edb8a9126ccb469cc;p=nextcloud-desktop.git

Merge branch '2.0'

Conflicts:
	ChangeLog
---

46269dac4eb9ce78a7bfc77edb8a9126ccb469cc
diff --cc ChangeLog
index 274735b05,783f4e65a..3ad7a3b49
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,6 +1,12 @@@
  ChangeLog
  =========
 +version 2.1 (release 2015-yy-zz)
 + * We removed the old libneon-based propagator.
 +   It was already disabled on OS X and Windows and only used on
 +   Linux when building with Qt < 5.4 and having bandwidth limiting enabled.
 +   So now you need Qt 5.4 on Linux if you want bandwidth limiting.
 +
- version 2.0.2 (release 2015-10-22)
+ version 2.0.2 (release 2015-10-21)
    * csync_file_stat_s: Save a bit of memory
    * Shibboleth: Add our base user agent to WebKit
    * SelectiveSync: Increase folder list timeout to 60