Merge branch 'develop' into erikj/reactor_metrics

2 files changed, 3 insertions, 1 deletions

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

index 888ad6ed4a..abb649958e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,3 +16,6 @@ ignore =
     docs/*
     pylint.cfg
     tox.ini
+
+[flake8]
+max-line-length = 90
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py

index 4d74bd5d78..854e17a473 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object):
                             producer
                         )
 
-
                         return self.clock.time_bound_deferred(
                             request_deferred,
                             time_out=timeout/1000. if timeout else 60,