Merge remote-tracking branch 'origin/master' into develop

24081224 · Richard van der Hoff · 59984e9f · a2849a18 · 24081224
Commit 24081224 authored 8 years ago by Richard van der Hoff
--- a/README.rst
+++ b/README.rst
@@ -75,7 +75,7 @@ at the `Matrix spec <https://matrix.org/docs/spec>`_, and experiment with the

 Thanks for using Matrix!

-[1] End-to-end encryption is currently in beta: `blog post <https://matrix.org/blog/2016/11/21/matrixs-olm-end-to-end-encryption-security-assessment-released-and-implemented-cross-platform-on-riot-at-last>`.
+[1] End-to-end encryption is currently in beta: `blog post <https://matrix.org/blog/2016/11/21/matrixs-olm-end-to-end-encryption-security-assessment-released-and-implemented-cross-platform-on-riot-at-last>`_.


 Synapse Installation