summary refs log tree commit diff
path: root/changelog.d/10115.bugfix
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-06-16 15:35:00 +0100
committerRichard van der Hoff <richard@matrix.org>2021-06-16 15:35:00 +0100
commit89013b99bd6bf54c079db27059a57d48dc9bac0f (patch)
tree2cb94604893136c35e16e053139617b30f65c20b /changelog.d/10115.bugfix
parentMerge branch 'release-v1.36' into matrix-org-hotfixes (diff)
parentA guide to the request log lines format. (#8436) (diff)
downloadsynapse-89013b99bd6bf54c079db27059a57d48dc9bac0f.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'changelog.d/10115.bugfix')
-rw-r--r--changelog.d/10115.bugfix1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/10115.bugfix b/changelog.d/10115.bugfix
new file mode 100644
index 0000000000..e16f356e68
--- /dev/null
+++ b/changelog.d/10115.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse v1.25.0 that prevented the `ip_range_whitelist` configuration option from working for federation and identity servers. Contributed by @mikure.