summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/soledad/soledadbootstrapper.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-21 14:56:47 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-21 14:56:47 -0300
commit2984b7f5f465f99f65dc911ddf8e8ffb5481d23a (patch)
treed087cb88822e7d169e09f7debe8354e5a8ce7df9 /src/leap/bitmask/services/soledad/soledadbootstrapper.py
parent65f4862e21a96c4fff8915f3cfff713f52ec2c61 (diff)
parent5c525fb850639326e14d183bcd273e5e73d3dfe7 (diff)
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
Diffstat (limited to 'src/leap/bitmask/services/soledad/soledadbootstrapper.py')
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 9e150226..a481df4e 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -35,7 +35,7 @@ from leap.common.check import leap_assert, leap_assert_type
from leap.common.files import get_mtime
from leap.keymanager import KeyManager, openpgp
from leap.keymanager.errors import KeyNotFound
-from leap.soledad import Soledad
+from leap.soledad.client import Soledad
logger = logging.getLogger(__name__)