Merge remote-tracking branch 'origin/master' into 2.3

We can do that because the only changes that were in master but not in 2.3 were the
translations change and documentation change, and the support for the 'M' permission
which we want in 2.3.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/folder.h b/src/gui/folder.h
index 6c4b73c2d..4cff41357 100644
--- a/src/gui/folder.h
+++ b/src/gui/folder.h
@@ -288,7 +288,7 @@ private slots:
 
     void slotEmitFinishedDelayed();
 
-    void slotNewBigFolderDiscovered(const QString &);
+    void slotNewBigFolderDiscovered(const QString &, bool isExternal);
 
     void slotLogPropagationStart();