diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-03-03 15:20:49 +0000 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-03-03 15:20:49 +0000 |
commit | 43f874055d1dfc70496db3c1ac7e962515e4ff94 (patch) | |
tree | d7274030db58fdca49cb03c316957d5907fa65e3 /changelog.d | |
parent | Validate the alt_aliases property of canonical alias events (#6971) (diff) | |
parent | Update debian changelog (diff) | |
download | synapse-43f874055d1dfc70496db3c1ac7e962515e4ff94.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/6996.bugfix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/6996.bugfix b/changelog.d/6996.bugfix deleted file mode 100644 index 765d376c7c..0000000000 --- a/changelog.d/6996.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix bug which caused an error when joining a room, with `'coroutine' object has no attribute 'event_id'`. |