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

Browse source

Conflicts:
	synapse/handlers/sliding_sync.py
	tests/handlers/test_sliding_sync.py

...

This commit is contained in:

Eric Eastwood 2024-06-13 13:59:44 -05:00

parent aff2e82281 c12ee0d5ba

commit 0ea4fdd354

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