summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-02 15:26:11 +0100
committerErik Johnston <erik@matrix.org>2014-09-02 15:26:11 +0100
commit464e1fcfa5fbbc51d8b1502df5971cfd2189fd37 (patch)
treef2cf21ddaa6383c7819194cad1df2b5e2d2007be /webclient
parentBF: Prevent controllers from being instantiated twice. (diff)
parentv0.1.2 (diff)
downloadsynapse-464e1fcfa5fbbc51d8b1502df5971cfd2189fd37.tar.xz
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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions