mirror of
https://github.com/element-hq/synapse
synced 2024-06-30 17:13:29 +00:00
Merge branch 'develop' into madlittlemods/msc3575-sliding-sync-filter-encrypted2
Conflicts: synapse/handlers/sliding_sync.py tests/handlers/test_sliding_sync.py
This commit is contained in:
commit
0ea4fdd354