Age | Commit message (Collapse) | Author |
|
'refs/remotes/drebs/bug/4475_use-couch-document' into develop
Conflicts:
src/leap/mx/mail_receiver.py
|
|
|
|
The message is already in str type, so we don't care about
encoding. json.dumps will ignore convertion.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'drebs/feature/4356_add-x-leap-provenance-header-to-incoming-emails' into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Also add some files I forgot to add in a different feature branch.
|
|
'chiiph/bug/pick_correct_recipient_and_encodign' into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'chiiph/bug/support_mailing_lists_and_encodings' into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Closes: #3601
|
|
|
|
|