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

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

parents 96a9a296 2bdafaf3
No related branches found
No related tags found
No related merge requests found
Showing
with 185 additions and 121 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