summaryrefslogtreecommitdiff
path: root/src/leap/mail/imap/service/imap.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-21 14:55:24 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-21 14:55:24 -0300
commit96be9573319456869c76de59b59e309a75fd15a6 (patch)
treea13d2d75771e2e45ee07a94cf39c43083db20cbb /src/leap/mail/imap/service/imap.py
parent35bdd37d15732af2cf59636ecf6970f147fd3747 (diff)
parent410908917841bc2decbd4d00e04f75e2e6f1b88d (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/imap/service/imap.py')
-rw-r--r--src/leap/mail/imap/service/imap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/mail/imap/service/imap.py b/src/leap/mail/imap/service/imap.py
index 6b2a61d..4dcb49a 100644
--- a/src/leap/mail/imap/service/imap.py
+++ b/src/leap/mail/imap/service/imap.py
@@ -32,7 +32,7 @@ from leap.common.check import leap_assert, leap_assert_type
from leap.keymanager import KeyManager
from leap.mail.imap.server import SoledadBackedAccount
from leap.mail.imap.fetch import LeapIncomingMail
-from leap.soledad import Soledad
+from leap.soledad.client import Soledad
IMAP_PORT = 1984
# The default port in which imap service will run