diff options
author | David Robertson <davidr@element.io> | 2023-08-01 12:01:34 +0100 |
---|---|---|
committer | David Robertson <davidr@element.io> | 2023-08-01 12:01:34 +0100 |
commit | a4102d2a5f0153f8f0d3169a409df0245e0799bd (patch) | |
tree | 3ed4d38d76120cd6d962e549138774b90a6c1d52 | |
parent | Combine duplicated code for calculating an event ID from a txn ID (#16023) (diff) | |
parent | 1.89.0 (diff) | |
download | synapse-a4102d2a5f0153f8f0d3169a409df0245e0799bd.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 |