Merge upstream

This commit is contained in:
hunbernd 2020-01-22 00:16:41 +01:00
commit b3ac3d58a9
67 changed files with 891 additions and 878 deletions

View file

@ -49,7 +49,7 @@ public:
/* FeedHolder */
virtual QScrollArea *getScrollArea();
virtual void deleteFeedItem(QWidget *item, uint32_t type);
virtual void deleteFeedItem(FeedItem *item, uint32_t type);
virtual void openChat(const RsPeerId& peerId);
virtual void openComments(uint32_t type, const RsGxsGroupId &groupId, const QVector<RsGxsMessageId> &versions, const RsGxsMessageId &msgId, const QString &title);