summary refs log tree commit diff
path: root/demo/README
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-07 11:07:27 +0100
committerErik Johnston <erik@matrix.org>2016-06-07 11:07:27 +0100
commitdbd788c2621d3f6af3dfe1624f81858ea561fcc5 (patch)
tree99a1c75673f8dc629b1405a1a1ebf5caa3823468 /demo/README
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/timings (diff)
parentFix AS retries, but with correct ordering (diff)
downloadsynapse-erikj/timings.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings erikj/timings
Diffstat (limited to 'demo/README')
0 files changed, 0 insertions, 0 deletions