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

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

Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql
parents 875a481a bd03947c
Branches
Tags
Hide whitespace changes
Inline Side-by-side
Showing
with 230 additions and 669 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment