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

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

parents 9643a6f7 c7181dcc
No related branches found
No related tags found
No related merge requests found
Showing
with 84 additions and 19 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