diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:55:24 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:55:24 -0300 |
| commit | 96be9573319456869c76de59b59e309a75fd15a6 (patch) | |
| tree | a13d2d75771e2e45ee07a94cf39c43083db20cbb /src/leap/mail/smtp | |
| parent | 35bdd37d15732af2cf59636ecf6970f147fd3747 (diff) | |
| parent | 410908917841bc2decbd4d00e04f75e2e6f1b88d (diff) | |
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
Conflicts:
src/leap/mail/imap/fetch.py
src/leap/mail/imap/server.py
Diffstat (limited to 'src/leap/mail/smtp')
| -rw-r--r-- | src/leap/mail/smtp/tests/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/mail/smtp/tests/__init__.py b/src/leap/mail/smtp/tests/__init__.py index d952405..7fed7da 100644 --- a/src/leap/mail/smtp/tests/__init__.py +++ b/src/leap/mail/smtp/tests/__init__.py @@ -29,7 +29,7 @@ from mock import Mock from twisted.trial import unittest -from leap.soledad import Soledad +from leap.soledad.client import Soledad from leap.keymanager import ( KeyManager, openpgp, |