Merge branch 'develop' into madlittlemods/msc3575-sliding-sync-filtering

Browse source

Conflicts:
	synapse/handlers/sliding_sync.py
	tests/handlers/test_sliding_sync.py
	tests/rest/client/test_sync.py

...

This commit is contained in:

Eric Eastwood 2024-06-06 15:08:30 -05:00

parent b457c0b2e2 4a7c58642c

commit 90315b0eb5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available