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

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

parents 4fc52b10 354a99c9
No related branches found
No related tags found
Loading
Showing with 2480 additions and 2855 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