Merge master and fix conflicts

1 files changed, 2 insertions, 0 deletions

diff --git a/src/notifications/Manager.h b/src/notifications/Manager.h

index e6be5953..b5347bd6 100644
--- a/src/notifications/Manager.h
+++ b/src/notifications/Manager.h
@@ -36,6 +36,7 @@ public:
 
 signals:
         void notificationClicked(const QString roomId, const QString eventId);
+        void sendNotificationReply(const QString roomId, const QString eventId, const QString body);
 
 public slots:
         void removeNotification(const QString &roomId, const QString &eventId);
@@ -58,6 +59,7 @@ private:
 private slots:
         void actionInvoked(uint id, QString action);
         void notificationClosed(uint id, uint reason);
+        void notificationReplied(uint id, QString reply);
 };
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)