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

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

parents f788c9eb 5f547655
No related branches found
No related tags found
Loading
Showing
with 95 additions and 109 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