summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-11-06 13:51:11 +0000
committerRichard van der Hoff <richard@matrix.org>2019-11-06 13:51:11 +0000
commit915903eadaeea1944ed42c79636dd94d4aa98f64 (patch)
tree986626d7f935d4acbbccf873ac870f3887354e42 /changelog.d
parentFix bug which caused rejected events to be stored with the wrong room state ... (diff)
parentMerge branch 'release-v1.5.1' (diff)
downloadsynapse-915903eadaeea1944ed42c79636dd94d4aa98f64.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/6331.feature1
-rw-r--r--changelog.d/6334.feature1
2 files changed, 0 insertions, 2 deletions
diff --git a/changelog.d/6331.feature b/changelog.d/6331.feature
deleted file mode 100644
index eaf69ef3f6..0000000000
--- a/changelog.d/6331.feature
+++ /dev/null
@@ -1 +0,0 @@
-Limit the length of data returned by url previews, to prevent DoS attacks.
diff --git a/changelog.d/6334.feature b/changelog.d/6334.feature
deleted file mode 100644
index eaf69ef3f6..0000000000
--- a/changelog.d/6334.feature
+++ /dev/null
@@ -1 +0,0 @@
-Limit the length of data returned by url previews, to prevent DoS attacks.