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

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

Conflicts:
	synapse/http/server.py
        synapse/http/content_repository.py
parents bc213502 10afd895
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 247 additions and 177 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment