summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-07-26 12:39:33 +0100
committerRichard van der Hoff <richard@matrix.org>2019-07-26 12:39:33 +0100
commitd74595e2ca2fcf23c04d28e11d4fe1de74ed4f4a (patch)
treea00671f417602e46b5e6d9c31bcd2f92b4095673 /changelog.d
parentMerge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch (diff)
parentyet more changelog attribution fixes (diff)
downloadsynapse-d74595e2ca2fcf23c04d28e11d4fe1de74ed4f4a.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/5744.bugfix1
-rw-r--r--changelog.d/5767.bugfix1
2 files changed, 0 insertions, 2 deletions
diff --git a/changelog.d/5744.bugfix b/changelog.d/5744.bugfix
deleted file mode 100644
index 7b67ebb2d3..0000000000
--- a/changelog.d/5744.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Log when we receive a `/make_*` request from a different origin.
diff --git a/changelog.d/5767.bugfix b/changelog.d/5767.bugfix
deleted file mode 100644
index 1a76d02e32..0000000000
--- a/changelog.d/5767.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Log when a redaction attempts to redact an event in a different room.