summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-18 15:53:39 +0000
committerErik Johnston <erik@matrix.org>2015-11-18 15:53:39 +0000
commit1fe973fa5a2a8b8adbf336d1f3a81b806f6f28bd (patch)
treece7ac77b3714ccaa6d54cb30201ce5cfa2041e63 /demo
parentMerge pull request #384 from matrix-org/erikj/shorter_retries (diff)
parentMerge branch 'hotfixes-v0.11.0-r1' (diff)
downloadsynapse-1fe973fa5a2a8b8adbf336d1f3a81b806f6f28bd.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions