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

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

parents 07493607 5b9786ee
No related branches found
No related tags found
Loading
Showing with 1144 additions and 665 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