summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-01 18:30:07 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-01 18:30:07 +0100
commit00b042a3eb1593a10f4dd149c0c45646178dc71a (patch)
treec7658c55c386ea2f106a6aa06ddf73c26776f9c1 /synapse
parentEnable SSL for s2s http client (diff)
parentFollow API renaming. state -> presence. mtime_ago -> last_active_ago (diff)
downloadsynapse-00b042a3eb1593a10f4dd149c0c45646178dc71a.tar.xz
Merge remote-tracking branch 'origin/develop' into server2server_tls
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions