summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2014-11-25 12:30:40 -0200
committerdrebs <drebs@leap.se>2014-11-25 12:30:40 -0200
commit22fddf85a3fa50f7ab164b2a9311cb01a9818e62 (patch)
tree84f4552818b9efa7858a3e9f5f5c0a94bd04a7cc /changes
parent27776fbab6fe963082a882dfb5232c54b0195d5f (diff)
parent2f29739946db6cd360296639830a3bfe7d8c3f31 (diff)
Merge branch 'feature/6299_new_doc' into develop
Diffstat (limited to 'changes')
-rw-r--r--changes/feature-6212_multi_uid_support1
-rw-r--r--changes/feature-6299_new_doc2
2 files changed, 3 insertions, 0 deletions
diff --git a/changes/feature-6212_multi_uid_support b/changes/feature-6212_multi_uid_support
new file mode 100644
index 0000000..495b8c4
--- /dev/null
+++ b/changes/feature-6212_multi_uid_support
@@ -0,0 +1 @@
+- Multi uid support (closes #6212)
diff --git a/changes/feature-6299_new_doc b/changes/feature-6299_new_doc
new file mode 100644
index 0000000..c893338
--- /dev/null
+++ b/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)