summary refs log tree commit diff
path: root/changelog.d/9801.doc
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-04-29 16:41:04 +0100
committerErik Johnston <erik@matrix.org>2021-04-29 16:41:04 +0100
commit4a3a9597f500fe62a4ab4dd2af966ee704fbea02 (patch)
treeba0f7c76e176dc7c427798cca2fabc27f7af57e5 /changelog.d/9801.doc
parentNewsfile (diff)
parentMerge tag 'v1.33.0rc2' into develop (diff)
downloadsynapse-4a3a9597f500fe62a4ab4dd2af966ee704fbea02.tar.xz
Merge remote-tracking branch 'origin/develop' into erikj/test_send
Diffstat (limited to 'changelog.d/9801.doc')
-rw-r--r--changelog.d/9801.doc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/9801.doc b/changelog.d/9801.doc
deleted file mode 100644
index 8b8b9d01d4..0000000000
--- a/changelog.d/9801.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add a note to the docker docs mentioning that we mirror upstream's supported Docker platforms.