summaryrefslogtreecommitdiff
path: root/changes/feature-4877_disable-akm-import
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-20 11:53:37 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-20 11:53:37 -0300
commit8a05b6fcc913a21ce7b3fa950c63a2ebda76c6f2 (patch)
tree962fc70bcd7dd34219a42a3e7b272a44ae37b2e9 /changes/feature-4877_disable-akm-import
parent9d7152f7f7e81cf1c8838ad2cbeba3ff6fac41a7 (diff)
parent01208db08da7cb48ee6239c917fceb2d6846228d (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/disable-akm-import' into develop
Diffstat (limited to 'changes/feature-4877_disable-akm-import')
-rw-r--r--changes/feature-4877_disable-akm-import1
1 files changed, 1 insertions, 0 deletions
diff --git a/changes/feature-4877_disable-akm-import b/changes/feature-4877_disable-akm-import
new file mode 100644
index 00000000..eeb70e19
--- /dev/null
+++ b/changes/feature-4877_disable-akm-import
@@ -0,0 +1 @@
+- Disable Advanced Key Manager import feature since it's experimental and may cause data loss. Closes #4877.