diff options
| author | Kali Kaneko <kali@leap.se> | 2014-09-24 13:32:54 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-09-24 13:32:54 -0500 |
| commit | f7da7ebb24e1a1c1f65cd257e949c0aa7ff23781 (patch) | |
| tree | 93f6a81820d0d868dd7a086145db5ce3971cf509 /src/leap/bitmask/services/soledad/soledadbootstrapper.py | |
| parent | cb5f07a8bac7afbbb0c43622d6c831295b6889cb (diff) | |
| parent | c1fa3959fbffb381e067dcd619d528412e235401 (diff) | |
Merge branch 'develop' into deb-0.7.0-rc1
Conflicts:
docs/man/bitmask-root.1.rst
Diffstat (limited to 'src/leap/bitmask/services/soledad/soledadbootstrapper.py')
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index c4e43bfe..745645f3 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,7 +45,8 @@ from leap.common.files import which from leap.keymanager import KeyManager, openpgp from leap.keymanager.errors import KeyNotFound from leap.soledad.common.errors import InvalidAuthTokenError -from leap.soledad.client import Soledad, BootstrapSequenceError +from leap.soledad.client import Soledad +from leap.soledad.client.secrets import BootstrapSequenceError logger = logging.getLogger(__name__) |