diff options
author | David Robertson <davidr@element.io> | 2023-08-30 12:41:42 +0100 |
---|---|---|
committer | David Robertson <davidr@element.io> | 2023-08-30 12:41:42 +0100 |
commit | 05d824526a4a55a3d5211e6dc077177c6ee2d571 (patch) | |
tree | 965d11ed5d765c34593efde389c9d3ee6b6e3a20 | |
parent | Stop writing to the event_txn_id table (#16175) (diff) | |
parent | 1.91.0 (diff) | |
download | synapse-05d824526a4a55a3d5211e6dc077177c6ee2d571.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 5 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | pyproject.toml | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md |