Skip to content
Snippets Groups Projects
Commit fc5d9375 authored by Neil Johnson's avatar Neil Johnson
Browse files

Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking

parents eabc5f82 dc56c47d
No related branches found
No related tags found
Loading
Showing with 78 additions and 1 deletion
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