summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-20 16:24:21 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-20 16:24:21 +0100
commitdb8d4e8dd686300adee10ab7bf23b0af7ab3bad5 (patch)
treecfb96f8d15d411ac702208a320b0777456532186 /synapse/server.py
parentImplement v2 key lookup (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-db8d4e8dd686300adee10ab7bf23b0af7ab3bad5.tar.xz
Merge branch 'develop' into key_distribution
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions