summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst7
-rw-r--r--flake8/__init__.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index d24840f..ad3d2c3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
CHANGES
=======
+2.6.1 - 2016-06-25
+------------------
+
+- **Bug** Update the config files to search for to include ``setup.cfg`` and
+ ``tox.ini``. This was broken in 2.5.5 when we stopped passing
+ ``config_file`` to our Style Guide
+
2.6.0 - 2016-06-15
------------------
diff --git a/flake8/__init__.py b/flake8/__init__.py
index f0e5e1e..574f407 100644
--- a/flake8/__init__.py
+++ b/flake8/__init__.py
@@ -1 +1 @@
-__version__ = '2.6.0'
+__version__ = '2.6.1'