diff options
| author | Dan Callahan <danc@element.io> | 2021-10-27 20:04:00 +0100 |
|---|---|---|
| committer | Dan Callahan <danc@element.io> | 2021-10-27 20:04:00 +0100 |
| commit | 0dffa9d0e096e5ff04768b2e06ce4acf92120486 (patch) | |
| tree | aa501e65702a3e3fb179c3a0c37dc15543637f72 /changelog.d/11001.bugfix | |
| parent | Changelog (diff) | |
| parent | Annotate `log_function` decorator (#10943) (diff) | |
| download | synapse-0dffa9d0e096e5ff04768b2e06ce4acf92120486.tar.xz | |
Merge remote-tracking branch 'origin/develop' into shellcheck
Fixes a merge conflict with debian/changelog Signed-off-by: Dan Callahan <danc@element.io>
Diffstat (limited to 'changelog.d/11001.bugfix')
| -rw-r--r-- | changelog.d/11001.bugfix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/11001.bugfix b/changelog.d/11001.bugfix deleted file mode 100644 index f51ffb3481..0000000000 --- a/changelog.d/11001.bugfix +++ /dev/null @@ -1 +0,0 @@ - Fix a long-standing bug which meant that events received over federation were sometimes incorrectly accepted into the room state. |