diff options
author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2024-04-16 17:36:21 +0100 |
---|---|---|
committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2024-04-16 17:36:21 +0100 |
commit | 3a196b3227776a584452936033d25a0090b481f5 (patch) | |
tree | 917a1ff941cb3c0de79f895f6510fee4aa32753b | |
parent | bugfix: make msc3967 idempotent (#16943) (diff) | |
parent | 1.105.0 (diff) | |
download | synapse-3a196b3227776a584452936033d25a0090b481f5.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 |