Merge master and fix conflicts

1 files changed, 0 insertions, 1 deletions

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

index 3571f079..6d62545c 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -65,7 +65,6 @@ public:
           std::function<void(const mtx::requests::CreateRoom &request)> callback);
         void openJoinRoomDialog(std::function<void(const QString &room_id)> callback);
         void openLogoutDialog();
-        void openMemberListDialog(const QString &room_id);
         void openReadReceiptsDialog(const QString &event_id);
 
         void hideOverlay();