diff options
| author | Tomas Touceda <chiiph@leap.se> | 2013-06-21 11:58:43 -0300 |
|---|---|---|
| committer | Tomas Touceda <chiiph@leap.se> | 2013-06-21 11:58:43 -0300 |
| commit | d4ea5ac0e78aff6a9224073b4096aa9ad52d4382 (patch) | |
| tree | 6d803596fe08450a678e39210eb6c2fc9a6db9a0 /changes/feature_encrypt-storage-key-with-kdf | |
| parent | 194ff4c40047462e112737a74968ec21a75bfba7 (diff) | |
| parent | eb4d19190cd4b726613a04bae534c2f1b89c7183 (diff) | |
Merge remote-tracking branch 'drebs/feature/2616-separate-soledad-into-client-and-server-2' into develop
Diffstat (limited to 'changes/feature_encrypt-storage-key-with-kdf')
0 files changed, 0 insertions, 0 deletions