Merge branch 'e2ee'

- Support for e2ee rooms
- Implement categories & file logging
- Let the user know when the app can't reach the server (#93)

fixes #13
fixes #326

1 files changed, 1 insertions, 1 deletions

diff --git a/include/MainWindow.h b/include/MainWindow.h

index 0fbc7567..b068e8f6 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -96,7 +96,7 @@ private slots:
         void showUserSettingsPage() { pageStack_->setCurrentWidget(userSettingsPage_); }
 
         //! Show the chat page and start communicating with the given access token.
-        void showChatPage(QString user_id, QString home_server, QString token);
+        void showChatPage();
 
         void showOverlayProgressBar();
         void removeOverlayProgressBar();