Eric Eastwood ec35be57e0 Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill ...

Conflicts:
	scripts-dev/complement.sh
	synapse/handlers/federation_event.py
	synapse/handlers/message.py
	synapse/storage/databases/main/event_federation.py

2021-11-03 02:10:07 -05:00

2.5 KiB

Executable File

Raw Blame History

View Raw