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

Merge branch 'develop' into markjh/verify 

Conflicts:
	synapse/crypto/keyring.py
parents fe1b3699 884b8008
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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