Merge branch 'master' of github.com:matrix-org/synapse

This commit is contained in:
Kegan Dougal 2014-08-13 11:58:01 +01:00
commit ebfc4389ad

View File

@ -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
===========