diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 13:29:17 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 13:29:17 +0100 |
commit | a9512d0994bba12cd3684d37030ce68ebe9330b3 (patch) | |
tree | 6a80e8f1fa89fccf0cd90ea251edb7c1fb28224c /docs/server-server/specification.rst | |
parent | Merge branch 'develop' into server2server_tls (diff) | |
parent | add another public wishlist item (diff) | |
download | synapse-a9512d0994bba12cd3684d37030ce68ebe9330b3.tar.xz |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'docs/server-server/specification.rst')
-rw-r--r-- | docs/server-server/specification.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/server-server/specification.rst b/docs/server-server/specification.rst |