diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-30 11:28:44 -0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-30 11:28:44 -0200 |
| commit | 115c7a4e638bdd930844ab9efee2521784e5e7ad (patch) | |
| tree | 445ec04d37c7d17b8e1acb782998da407cb9e20f /client/src/leap | |
| parent | 7f8ef3746bc4031c5d277420b64e954796331182 (diff) | |
| parent | 8b61202b82a09ec8994c38383d3a14fb378eaf55 (diff) | |
Merge remote-tracking branch 'ivan-github/bug/4330_soledad-bootstrapping-problem' into develop
Diffstat (limited to 'client/src/leap')
| -rw-r--r-- | client/src/leap/soledad/client/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py index e946b71b..f3820a51 100644 --- a/client/src/leap/soledad/client/__init__.py +++ b/client/src/leap/soledad/client/__init__.py @@ -1190,7 +1190,7 @@ class Soledad(object): doc='The secret used for symmetric encryption.') def _get_passphrase(self): - return self._passphrase.decode("UTF-8") + return self._passphrase passphrase = property( _get_passphrase, |