Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
_build_key_from_gpg in keymanager has changed
|
|
|
|
|
|
'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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Also add some files I forgot to add in a different feature branch.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
Conflicts:
src/leap/mx/mail_receiver.py
|
|
|
|
|
|
|
|
|
|
|
|
Also, some pep8 fixes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|