Eric Eastwood d0d198fa74 Merge branch 'develop' into madlittlemods/msc3575-sliding-sync-filter-dms ...

Conflicts:
	synapse/handlers/sliding_sync.py

2024-06-10 15:05:42 -05:00

..

admin

Fix filtering of rooms when supplying the destination query parameter to /_synapse/admin/v1/federation/destinations/<destination>/rooms (#17077)

2024-04-26 10:52:24 +01:00

client

Merge branch 'develop' into madlittlemods/msc3575-sliding-sync-filter-dms

2024-06-10 15:05:42 -05:00

key

Correctly mention previous copyright (#16820)

2024-01-23 11:26:48 +00:00

media

Fix slipped logging context when media rejected (#17239)

2024-05-29 11:14:42 +01:00

synapse

An federation whitelist query endpoint extension (#16848)

2024-05-13 19:38:45 +00:00

__init__.py

Correctly mention previous copyright (#16820)

2024-01-23 11:26:48 +00:00

test_health.py

Correctly mention previous copyright (#16820)

2024-01-23 11:26:48 +00:00

test_well_known.py

Merge remote-tracking branch 'gitlab/clokep/license-license' into new_develop

2023-12-13 15:11:56 +00:00