Skip to content
Snippets Groups Projects
Commit 47519cd8 authored by Erik Johnston's avatar Erik Johnston
Browse files

Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor

Conflicts:
	synapse/handlers/events.py
	synapse/rest/events.py
	synapse/rest/room.py
parents bd16b93e 474d9137
No related branches found
No related tags found
No related merge requests found
Showing
with 731 additions and 653 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment