diff options
author | David Robertson <davidr@element.io> | 2023-04-25 12:50:18 +0100 |
---|---|---|
committer | David Robertson <davidr@element.io> | 2023-04-25 12:50:18 +0100 |
commit | b39b02c26e9550c629c027a06b25d64e94fe8e5e (patch) | |
tree | aaa5221264f39007754d5fd22b029edabb69ae37 | |
parent | Re re introduce membership tables event stream ordering (#15356) (diff) | |
parent | 1.82.0 (diff) | |
download | synapse-b39b02c26e9550c629c027a06b25d64e94fe8e5e.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 |