diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
commit | 1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab (patch) | |
tree | 92d4bb31a1372239e317f8672d6b80e59b709523 /README.rst | |
parent | Oops. Removed my NetBeans private folders (diff) | |
parent | For the content repo, don't just use homeserver.hostname as that might not in... (diff) | |
download | synapse-1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab.tar.xz |
Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop
Diffstat (limited to 'README.rst')
-rw-r--r-- | README.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/README.rst b/README.rst index 069f37ec06..cfdc2a1c75 100644 --- a/README.rst +++ b/README.rst @@ -34,6 +34,10 @@ To get up and running: machine.my.domain.name``. Then come join ``#matrix:matrix.org`` and say hi! :) +For more detailed setup instructions, please see further down this document. + +[1] VoIP currently in development + About Matrix ============ @@ -85,8 +89,6 @@ 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 |