Merge branch 'master' into byte_string_fix

Ameriks · web-flow · commit 26268768c945 · 2018-11-07T18:07:45.000+02:00
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [flake8]
 exclude = build,dist,docs,.git,.tox,./two_factor/migrations/*.py,./two_factor/views/__init__.py
-ignore = E123,E128,E265,E266,E402,E501,E731,W503,W601
+ignore = E123,E128,E265,E266,E402,E501,E731,W503,W504,W601
 max-line-length = 119
 
 [isort]
