Merge branch 'develop' into client_v2_sync

Conflicts:
	synapse/rest/client/v2_alpha/__init__.py

2 files changed, 7 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore

index 2ed22b1cd3..3899c5a250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,9 @@ uploads
 
 .idea/
 media_store/
+
+*.tac
+
+build/
+
+localhost-800*/
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"],