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

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

Conflicts:
	synapse/storage/schema/im.sql
parents c515d377 9ec9d6f2
No related branches found
No related tags found
Loading
Showing
with 1166 additions and 25 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