summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-02-16 11:34:48 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2016-02-16 11:34:48 +0000
commitfeedaa37fa5a4522f7929cddf8fff0b30015a476 (patch)
treee94a84f912f109d57d598335159358d2e982ab62 /demo
parentBranch off member and non member sends (diff)
parentMerge pull request #577 from matrix-org/daniel/createroom (diff)
downloadsynapse-feedaa37fa5a4522f7929cddf8fff0b30015a476.tar.xz
Merge branch 'develop' into daniel/roomcleanupincremental
Conflicts:
	synapse/handlers/room.py
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions