summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-02 10:29:34 +0000
committerErik Johnston <erik@matrix.org>2014-12-02 10:29:34 +0000
commit740e95ee08e578fadd3e74c1289863a7d1dbabd9 (patch)
treea5a19a371bfdd3e96afe8e1ff6c30908195a4d7c
parentre-add OSX troubleshooting instructions (not sure how they got lost) (diff)
parentMerge pull request #21 from tjardick/master (diff)
downloadsynapse-740e95ee08e578fadd3e74c1289863a7d1dbabd9.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r--README.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.rst b/README.rst

index e6304e485c..8459bcac2e 100644 --- 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::