GitLab

FIXED-IN: 5.4.3
BUG: 377247

Summary:
Commit 6296818e (https://bugs.kde.org/show_bug.cgi?id=359964)
only did it partially, the unittest messagefactorytest was still failing
due to the useragent being present in many cases.

This fixes many test failures in that test, there's still one though:
testCreateReplyToAllWithUseSenderAndIdentityInCC shows a
"X-KMail-Identity: 2109233399" header and a wrong From field.

Test Plan: messagefactorytest

Reviewers: mlaurent, dvratil

Reviewed By: mlaurent, dvratil

Subscribers: #kde_pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D4809

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

CCMAIL: faure@kde.org

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This reverts commit 79ec4623.