Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections

Conflicts:
	synapse/storage/schema/delta/v12.sql

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py

index 043cd044a7..3249e87a96 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ setup(
     install_requires=[
         "syutil==0.0.2",
         "matrix_angular_sdk==0.6.0",
-        "Twisted>=14.0.0",
+        "Twisted==14.0.2",
         "service_identity>=1.0.0",
         "pyopenssl>=0.14",
         "pyyaml",