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

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

parents 51b2448e b105996f
Loading
Showing
No files found.
with 0 additions and 0 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