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

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

Conflicts:
	synapse/handlers/presence.py
parents a8d318cf efc5f344
No related branches found
No related tags found
Loading
Showing
with 483 additions and 289 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