diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-11 17:48:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-11 17:48:48 +0000 |
| commit | cde840a82c9397f9f880102520d0193462efc13f (patch) | |
| tree | 7e875e0514fd8db28244ba813927d293c4cb7929 /setup.py | |
| parent | Fix replication tests (diff) | |
| parent | Merge pull request #23 from matrix-org/media_repository (diff) | |
| download | synapse-cde840a82c9397f9f880102520d0193462efc13f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: setup.py
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/setup.py b/setup.py index 1d71e154e2..eb410aa6d3 100755 --- a/setup.py +++ b/setup.py @@ -42,6 +42,7 @@ setup( "daemonize", "py-bcrypt", "frozendict>=0.4", + "pillow", ], dependency_links=[ "https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2", |