merge conflicts, text copying from context menu in message line

This commit is contained in:
Blue 2022-04-30 21:41:25 +03:00
commit c3a45ec58c
Signed by untrusted user: blue
GPG key ID: 9B203B252A63EE38
38 changed files with 1221 additions and 798 deletions

View file

@ -29,6 +29,7 @@
#include <QPushButton>
#include <QProgressBar>
#include <QLabel>
#include <QTextDocument>
#include "shared/icons.h"
#include "shared/global.h"