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

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

parents d59acb8c 5879edbb
No related branches found
No related tags found
No related merge requests found
Showing
with 459 additions and 77 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