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

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

parents 9b3ab57a e2a4ba6f
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment