Commit a58bf805 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/release/20.08' into master

parents 4cd85f47 6074ec19
Pipeline #32790 canceled with stage
......@@ -568,6 +568,7 @@ void AttachmentControllerBase::createActions()
collection->addAction(QStringLiteral("attach_public_key"), d->attachPublicKeyAction);
collection->addAction(QStringLiteral("attach_my_public_key"), d->attachMyPublicKeyAction);
collection->addAction(QStringLiteral("attach"), d->addAttachmentFileAction);
collection->setDefaultShortcut(d->addAttachmentFileAction, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_A));
collection->addAction(QStringLiteral("attach_directory"), d->addAttachmentDirectoryAction);
collection->addAction(QStringLiteral("remove"), d->removeAction);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment