summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-11 18:17:49 +0000
committerErik Johnston <erik@matrix.org>2015-11-11 18:17:49 +0000
commitaa3ab6c6a057f58abe6f74637a5ce2aa08732edd (patch)
treeafb813a93991252bede451936872437f6802319f /demo
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 (diff)
parentMerge pull request #361 from matrix-org/daniel/guestcontext (diff)
downloadsynapse-aa3ab6c6a057f58abe6f74637a5ce2aa08732edd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions