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

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

parents dbc98c4e bde9ee5a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
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