Merge branch 'master' of https://github.com/Nheko-Reborn/nheko

2020-08-28 23:35:40 +03:00 · 2020-08-28 23:35:40 +03:00 · 5e344d2685
commit 5e344d2685
parent a173d964f7 b7b9cee30e
39 changed files with 4094 additions and 1224 deletions
--- a/src/TextInputWidget.h
+++ b/src/TextInputWidget.h
@ -180,6 +180,7 @@ private slots:
 signals:
        void sendTextMessage(const QString &msg);
        void sendEmoteMessage(QString msg);
+        void clearRoomTimeline();
        void heightChanged(int height);

        void uploadMedia(const QSharedPointer<QIODevice> data,