summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-20 14:43:02 +0100
committerErik Johnston <erik@matrix.org>2014-08-20 14:43:02 +0100
commitbeb0a179bdcae24068a2450ff1f67ed1472a9308 (patch)
treee160e37c1bd4763e6b700b75755b24968b634f70 /synapse
parentBetter handle the edge cases of trying to remote join rooms (diff)
parentAdded more jsfiddles. (diff)
downloadsynapse-beb0a179bdcae24068a2450ff1f67ed1472a9308.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions