diff options
| author | drebs <drebs@leap.se> | 2014-11-25 12:30:40 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2014-11-25 12:30:40 -0200 |
| commit | 930bb9db48d31b7ad2528564ca7d23fb696f1899 (patch) | |
| tree | c62b21cfba0d88e6eda3f202561bdf9404344152 /keymanager/changes | |
| parent | 27d2c307b31dd72705323e835d879c7654d5cac1 (diff) | |
| parent | b40e61f4d7624250325378d51a289a92773e785c (diff) | |
Merge branch 'feature/6299_new_doc' into develop
Diffstat (limited to 'keymanager/changes')
| -rw-r--r-- | keymanager/changes/feature-6212_multi_uid_support | 1 | ||||
| -rw-r--r-- | keymanager/changes/feature-6299_new_doc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/keymanager/changes/feature-6212_multi_uid_support b/keymanager/changes/feature-6212_multi_uid_support new file mode 100644 index 0000000..495b8c4 --- /dev/null +++ b/keymanager/changes/feature-6212_multi_uid_support @@ -0,0 +1 @@ +- Multi uid support (closes #6212) diff --git a/keymanager/changes/feature-6299_new_doc b/keymanager/changes/feature-6299_new_doc new file mode 100644 index 0000000..c893338 --- /dev/null +++ b/keymanager/changes/feature-6299_new_doc @@ -0,0 +1,2 @@ +- new soledad doc struct for encryption-keys (closes #6299) +- keep old key after upgrade (closes #6262) |