summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--changelogs/unreleased/sh-fix-issue-38246.yml5
2 files changed, 4 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 838a0a9bde9..6c671f8d53a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.0.1 (2017-09-23)
+
+- [FIXED] Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration.
+
## 10.0.0 (2017-09-22)
- [SECURITY] Upgrade brace-expansion NPM package due to security issue. !13665 (Markus Koller)
diff --git a/changelogs/unreleased/sh-fix-issue-38246.yml b/changelogs/unreleased/sh-fix-issue-38246.yml
deleted file mode 100644
index 8a127559fbb..00000000000
--- a/changelogs/unreleased/sh-fix-issue-38246.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration
-merge_request:
-author:
-type: fixed