diff options
author | Devon Hudson <devonhudson@librem.one> | 2024-07-03 10:19:23 -0600 |
---|---|---|
committer | Devon Hudson <devonhudson@librem.one> | 2024-07-03 10:19:23 -0600 |
commit | 0c4f7a3d1609b16c91e919bbcafb34fd7864cd40 (patch) | |
tree | a5c7482ba660e2e6b60946c0a670f2cc9aefa819 | |
parent | Add `room_types`/`not_room_types` filtering to Sliding Sync `/sync` (#17337) (diff) | |
parent | 1.110.0 (diff) | |
download | synapse-0c4f7a3d1609b16c91e919bbcafb34fd7864cd40.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 |