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

Merge remote-tracking branch 'origin/2.3'

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

4597201560a9e953eddeb9e1aa799355f2da5b97
diff --cc src/libsync/owncloudpropagator.h
index d1812e23c,0e7be74d7..0cb949e39
--- a/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@@ -272,9 -257,7 +272,6 @@@ public
  
  class OwncloudPropagator : public QObject {
      Q_OBJECT
- 
-     QScopedPointer<PropagateDirectory> _rootJob;
- 
 -    PropagateItemJob *createJob(const SyncFileItemPtr& item);
  public:
      const QString _localDir; // absolute path to the local directory. ends with '/'
      const QString _remoteFolder; // remote folder, ends with '/'