diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 19:56:22 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 19:56:22 +0100 |
commit | ff79437d9bceef3e6c824906a7588f3658e80e13 (patch) | |
tree | 5b3fea43683e68d8e7ea246e97b9958f4a41913e /sphinx_api_docs.sh | |
parent | Follow API renaming. state -> presence. mtime_ago -> last_active_ago (diff) | |
parent | Fix SSL for federation http client (diff) | |
download | synapse-ff79437d9bceef3e6c824906a7588f3658e80e13.tar.xz |
Merge branch 'server2server_tls' into develop
Diffstat (limited to 'sphinx_api_docs.sh')
0 files changed, 0 insertions, 0 deletions