diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-10-05 14:13:25 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-10-05 14:13:25 +0100 |
commit | 2faac70e63f0cd13749e03e3ca97b09761286be1 (patch) | |
tree | 7e0b65d0b22f99404ec491a7829b25b01e80a8f5 | |
parent | Ensure that we reject events which use rejected events for auth (#10956) (diff) | |
parent | 1.44.0 (diff) | |
download | synapse-2faac70e63f0cd13749e03e3ca97b09761286be1.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 6 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md |