summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-05-11 14:15:30 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-05-11 14:15:30 +0100
commit652a6b094d98e56290f0b6889cc401c364bad433 (patch)
treeba7a21ef2804be8fa33bf1463ecbfb0743090f06 /changelog.d
parentAdd config option to hide device names over federation (#9945) (diff)
parentUse link to advisory rather than to the CVE repo (diff)
downloadsynapse-652a6b094d98e56290f0b6889cc401c364bad433.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/9946.misc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/9946.misc b/changelog.d/9946.misc
deleted file mode 100644
index 142ec5496f..0000000000
--- a/changelog.d/9946.misc
+++ /dev/null
@@ -1 +0,0 @@
-Unpin attrs dependency.