Age | Commit message (Collapse) | Author |
|
|
|
into develop
|
|
#4566."
This reverts commit eb07702bc4c1d51e0307b655b14bc1a3835488b2.
|
|
This reverts commit 6eeed5c116d38ebae7d9309dd2f11660f6cff37e.
|
|
|
|
'refs/remotes/drebs/feature/4626_stop-creating-per-user-databases' into develop
|
|
|
|
into develop
|
|
|
|
'drebs/bug/4095_add-unicode-conversion-to-put_doc' into develop
|
|
|
|
|
|
|
|
'drebs/feature/4348_add-mac-verification-to-recovery-doc' into develop
|
|
|
|
|
|
|
|
Tag leap.soledad version 0.4.3
|
|
|
|
|
|
|
|
so it gets the right libsqlcipher version.
|
|
|
|
|
|
into develop
|
|
|
|
into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Tag leap.soledad version 0.4.2
Conflicts:
client/src/leap/soledad/client/__init__.py
|
|
|
|
|
|
|
|
|
|
|
|
'drebs/bug/fix-dict-representation-for-python-2.6' into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'ivan-github/bug/4330_soledad-bootstrapping-problem' into develop
|
|
As we enforce to have the passphrase as an unicode object, we no longer
need this conversion.
[Related to bug #4330]
|