diff options
author | Till Faelligen <2353100+S7evinK@users.noreply.github.com> | 2025-02-11 14:27:58 +0100 |
---|---|---|
committer | Till Faelligen <2353100+S7evinK@users.noreply.github.com> | 2025-02-11 14:27:58 +0100 |
commit | d6f9332a6b3bdbeef13f018620f9abbb7ed82212 (patch) | |
tree | fc7f068569372c242b3b9b17a0aaefcc359c58a4 | |
parent | Add `rc_presence` ratelimiting config to demo/start.sh (#18145) (diff) | |
parent | 1.124.0 (diff) | |
download | synapse-d6f9332a6b3bdbeef13f018620f9abbb7ed82212.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 |