diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-30 11:10:37 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-30 11:10:37 +0000 |
commit | 2ebf795c0ada8b30f22f9aca54753471a04649f6 (patch) | |
tree | 23710ca7b15e7d65eee8885a04b23a829ca00379 /synapse/python_dependencies.py | |
parent | Update the current state of an event if we update auth events. (diff) | |
parent | Include content in notification pokes (diff) | |
download | synapse-2ebf795c0ada8b30f22f9aca54753471a04649f6.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r-- | synapse/python_dependencies.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index b1fae991e0..ba9308803c 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -5,7 +5,8 @@ logger = logging.getLogger(__name__) REQUIREMENTS = { "syutil==0.0.2": ["syutil"], - "matrix_angular_sdk==0.6.0": ["syweb==0.6.0"], + "matrix_angular_sdk==0.6.0": ["syweb>=0.6.0"], + "matrix_angular_sdk>=0.6.0": ["syweb>=0.6.0"], "Twisted>=14.0.0": ["twisted>=14.0.0"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], |