diff options
author | David Robertson <davidr@element.io> | 2023-01-17 12:45:50 +0000 |
---|---|---|
committer | David Robertson <davidr@element.io> | 2023-01-17 12:45:50 +0000 |
commit | f820740b7d2a66ff67d61c5fad0a653eaec1a0d2 (patch) | |
tree | 9caa2879b042bef648b0b3c81c36c954fcefdb9d | |
parent | Stabilise serving partial join responses (#14839) (diff) | |
parent | 1.75.0 (diff) | |
download | synapse-f820740b7d2a66ff67d61c5fad0a653eaec1a0d2.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 6 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | pyproject.toml | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md |