summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-26 13:14:59 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-26 13:14:59 +0000
commit14ff33bd93152027990bb7d961e0be98bf1c26b5 (patch)
tree96092b7759947da81d12450ad49c712d845cf02d /synapse/python_dependencies.py
parentAdd client v2_alpha resource to synapse server resource tree (diff)
parentAdd client v2_alpha resource to synapse server resource tree (diff)
downloadsynapse-14ff33bd93152027990bb7d961e0be98bf1c26b5.tar.xz
Merge branch 'develop' into client_v2_sync
Conflicts:
	synapse/rest/client/v2_alpha/__init__.py
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index b1fae991e0..4182ad990f 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -5,7 +5,7 @@ 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"],
     "Twisted>=14.0.0": ["twisted>=14.0.0"],
     "service_identity>=1.0.0": ["service_identity>=1.0.0"],
     "pyopenssl>=0.14": ["OpenSSL>=0.14"],