summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-13 11:58:01 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-13 11:58:01 +0100
commitebfc4389ad14d595e085d3c77c89f3b462e43127 (patch)
treea12f97ac1f392859595767159cc7bbf67833fccb
parentReturn the room_alias when GETing public rooms. (diff)
parentfix footnotes a bit (diff)
downloadsynapse-ebfc4389ad14d595e085d3c77c89f3b462e43127.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse
-rw-r--r--README.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/README.rst b/README.rst

index ce0d51036e..2885c9f2f2 100644 --- a/README.rst +++ b/README.rst
@@ -51,9 +51,11 @@ https://github.com/matrix-org/synapse/issues or at matrix@matrix.org. Thanks for trying Matrix! -.. [1] VoIP currently in development -.. [2] Cryptographic signing of messages isn't turned on yet -.. [3] End-to-end encryption is currently in development +[1] VoIP currently in development + +[2] Cryptographic signing of messages isn't turned on yet + +[3] End-to-end encryption is currently in development Quick Start ===========