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

This commit is contained in:
Erik Johnston 2014-12-02 10:29:34 +00:00
commit 740e95ee08

View file

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