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

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

parents e5481b22 c99b6c66
No related branches found
No related tags found
No related merge requests found
Showing with 51 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