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

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

Conflicts:
	synapse/federation/transport.py
	synapse/handlers/message.py
parents bf8cdda2 15be1816
Branches
Tags
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 5482 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment