Merge master and fix conflicts

1 files changed, 1 insertions, 0 deletions

diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp

index 5a9cb83e..cc61c645 100644
--- a/src/notifications/ManagerWin.cpp
+++ b/src/notifications/ManagerWin.cpp
@@ -61,6 +61,7 @@ NotificationsManager::postNotification(const QString &room_id,
 }
 
 void NotificationsManager::actionInvoked(uint, QString) {}
+void NotificationsManager::notificationReplied(uint, QString) {}
 
 void NotificationsManager::notificationClosed(uint, uint) {}