summary refs log tree commit diff
path: root/changelog.d/8354.misc
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-09-18 12:54:04 -0400
committerGitHub <noreply@github.com>2020-09-18 12:54:04 -0400
commitbabc0275431c68e64050db11959d74a636afbd3e (patch)
tree1294ba77a0a06e4a5bbf24fbc2a4b28c77fc0343 /changelog.d/8354.misc
parentMerge tag 'v1.20.0rc5' into develop (diff)
downloadsynapse-babc0275431c68e64050db11959d74a636afbd3e.tar.xz
Fix a bad merge from release-v1.20.0. (#8354)
Diffstat (limited to 'changelog.d/8354.misc')
-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`.