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

740e95ee · Erik Johnston · dbc98c4e · bde9ee5a · 740e95ee
Commit 740e95ee authored 10 years ago by Erik Johnston
--- a/README.rst
+++ b/README.rst
@@ -94,7 +94,8 @@ header files for python C extensions.
 Installing prerequisites on Ubuntu or Debian::

    $ sudo apt-get install build-essential python2.7-dev libffi-dev \
-                           python-pip python-setuptools sqlite3
+                           python-pip python-setuptools sqlite3 \
+                           libssl-dev

 Installing prerequisites on Mac OS X::