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

Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse

Conflicts:
	webclient/room/room-controller.js
parents 64b6f09b afb7f173
No related branches found
No related tags found
Loading
Showing
with 176 additions and 13 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