diff options
author | Erik Johnston <erik@matrix.org> | 2024-10-15 15:01:48 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2024-10-15 15:01:48 +0100 |
commit | 2ce7a1edf7291cfda14bb975135eb7c989d910bc (patch) | |
tree | 933ccd00c13f469344c4ab29335cee25a807c7c4 | |
parent | Implement MSC4210: Remove legacy mentions (#17783) (diff) | |
parent | 1.117.0 (diff) | |
download | synapse-2ce7a1edf7291cfda14bb975135eb7c989d910bc.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 7 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | pyproject.toml | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md |