summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-13 17:18:52 +0100
committerErik Johnston <erik@matrix.org>2015-08-13 17:18:52 +0100
commit3d77e56c1283c0100fe8ecd11ea08d3a341296ef (patch)
tree4f8e54516ca642b3b36d6602261c91fe409f9662
parentRemove some vertical space (diff)
parentMerge pull request #224 from matrix-org/erikj/reactor_metrics (diff)
downloadsynapse-3d77e56c1283c0100fe8ecd11ea08d3a341296ef.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
-rw-r--r--setup.cfg3
1 files changed, 3 insertions, 0 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