summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-28 10:47:06 +0100
committerErik Johnston <erik@matrix.org>2016-07-28 10:47:06 +0100
commita2851940219d9a9d230a452ff22ae4e172b421c2 (patch)
tree45440922d6b10a9ed8f463aa639efb835072a34d /demo
parentBump version and changelog (diff)
parentCache getPeer (diff)
downloadsynapse-a2851940219d9a9d230a452ff22ae4e172b421c2.tar.xz
Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions