summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-01 16:31:09 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-01 16:31:09 +0100
commit46dcb0d8902c531e3b187453435913fc6e2344a9 (patch)
tree1bfb42952b976731888fb06a49e253d1037fa827 /MAP.rst
parentListen using SSL (diff)
parentmissing semicolon (diff)
downloadsynapse-46dcb0d8902c531e3b187453435913fc6e2344a9.tar.xz
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions