diff options
| author | Erik Johnston <erik@matrix.org> | 2020-10-30 16:27:02 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-10-30 16:27:02 +0000 |
| commit | f27a7896972d71af3ac21e82a81a64085fec32f1 (patch) | |
| tree | 3562d5ce93b4f21c927a5229165b2aabe1605698 /changelog.d | |
| parent | Merge branch 'release-v1.22.1' into develop (diff) | |
| parent | Fix changelog (diff) | |
| download | synapse-f27a7896972d71af3ac21e82a81a64085fec32f1.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/8676.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/8678.bugfix | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/changelog.d/8676.bugfix b/changelog.d/8676.bugfix deleted file mode 100644 index df16c72761..0000000000 --- a/changelog.d/8676.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a bug where an appservice may not be forwarded events for a room it was recently invited to. Broken in v1.22.0. diff --git a/changelog.d/8678.bugfix b/changelog.d/8678.bugfix deleted file mode 100644 index 0508d8f109..0000000000 --- a/changelog.d/8678.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix `Object of type frozendict is not JSON serializable` exceptions when using third-party event rules. |