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

Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0 

Conflicts:
	synapse/notifier.py
	webclient/room/room-controller.js
	webclient/room/room.html
parents e565a4bf 7b79c0f0
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