Skip to content
Snippets Groups Projects
Commit 4b63b06c authored by Mark Haines's avatar Mark Haines
Browse files

Merge branch 'develop' into storage_transactions 

Conflicts:
	synapse/api/auth.py
	synapse/handlers/room.py
	synapse/storage/__init__.py
parents 32347bfc ac21dfff
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1767 additions and 65 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