From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 31 Oct 2016 10:09:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into chunking-ng
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1014^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8ca3eb788333322141bd1606b93ce5335eecf86e;p=nextcloud-desktop.git

Merge remote-tracking branch 'origin/master' into chunking-ng
---

8ca3eb788333322141bd1606b93ce5335eecf86e
diff --cc src/libsync/account.h
index 62098b218,4ff73748e..36e606ebf
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@@ -63,22 -66,8 +66,12 @@@ public
      static AccountPtr create();
      ~Account();
  
-     void setSharedThis(AccountPtr sharedThis);
      AccountPtr sharedFromThis();
  
 +    /// The user that can be used in dav url
 +    QString user() const;
 +    void setUser(const QString &user);
 +
      /// The name of the account as shown in the toolbar
      QString displayName() const;