Merge master and fix conflicts

1 files changed, 4 insertions, 0 deletions

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

index 45a4ff63..004bb3e8 100644
--- a/src/ChatPage.h
+++ b/src/ChatPage.h
@@ -110,6 +110,10 @@ public:
         mtx::presence::PresenceState currentPresence() const;
 
 public slots:
+        void handleMatrixUri(const QByteArray &uri);
+        void handleMatrixUri(const QUrl &uri);
+
+        void startChat(QString userid);
         void leaveRoom(const QString &room_id);
         void createRoom(const mtx::requests::CreateRoom &req);
         void joinRoom(const QString &room);