diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-12-09 16:05:12 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-12-09 16:05:12 +0000 |
| commit | 4a9c38bfa3246bb6687379d7d638729959f71ecc (patch) | |
| tree | 22b12e4286622ab3757dc771626fc6c9b681bc35 | |
| parent | Merge pull request #1680 from matrix-org/erikj/joined_rooms (diff) | |
| download | synapse-4a9c38bfa3246bb6687379d7d638729959f71ecc.tar.xz | |
Fix broken README merge
When 546ec1a was merged into develop, I accidentally overwrote the change introduced in debbea5 (pr #1657). Reintroduce it.
Diffstat (limited to '')
| -rw-r--r-- | README.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/README.rst b/README.rst index 1140f8e1bc..0fb7a66cae 100644 --- a/README.rst +++ b/README.rst @@ -800,7 +800,7 @@ to install using pip and a virtualenv:: virtualenv env source env/bin/activate - python synapse/python_dependencies.py | xargs -n1 pip install + python synapse/python_dependencies.py | xargs pip install pip install setuptools_trial mock This will run a process of downloading and installing all the needed |