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

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Conflicts:
	synapse/storage/_base.py
parents beaf4384 e7736668
No related branches found
No related tags found
No related merge requests found
Showing
with 145 additions and 115 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