diff options
| author | Mathieu Velten <mathieuv@matrix.org> | 2023-09-12 15:22:26 +0200 |
|---|---|---|
| committer | Mathieu Velten <mathieuv@matrix.org> | 2023-09-12 15:22:26 +0200 |
| commit | 12bee2dcc2d5538f787236975fe4f276631d58b3 (patch) | |
| tree | ac7062b55e7e5162ade24a6dc54ff4fba99a3803 /changelog.d | |
| parent | Bump mypy from 1.4.1 to 1.5.1. (#16300) (diff) | |
| parent | 1.92.1 (diff) | |
| download | synapse-12bee2dcc2d5538f787236975fe4f276631d58b3.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/16255.misc | 1 | ||||
| -rw-r--r-- | changelog.d/16258.bugfix | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/changelog.d/16255.misc b/changelog.d/16255.misc deleted file mode 100644 index 94d6aff1d6..0000000000 --- a/changelog.d/16255.misc +++ /dev/null @@ -1 +0,0 @@ -Fix incorrect docstring for `Ratelimiter`. diff --git a/changelog.d/16258.bugfix b/changelog.d/16258.bugfix deleted file mode 100644 index d5ae2399e6..0000000000 --- a/changelog.d/16258.bugfix +++ /dev/null @@ -1 +0,0 @@ -Revert [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) introspection cache, admin impersonation and account lock. |