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

Merge remote-tracking branch 'origin/develop' into markjh/guest_access 

Conflicts:
	synapse/api/filtering.py
parents cdd04f70 e525b46f
No related branches found
No related tags 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