summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/8354.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/8354.misc b/changelog.d/8354.misc
new file mode 100644
index 0000000000..1d33cde2da
--- /dev/null
+++ b/changelog.d/8354.misc
@@ -0,0 +1 @@
+Fix bad merge from `release-v1.20.0` branch to `develop`.