Bump version and update changelog

marshmallow-code · Feb 2, 2016 · 47e5d96 · 47e5d96
1 parent 5592400
commit 47e5d96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,7 +1,7 @@
 Changelog
 ---------
 
-2.6.0 (unreleased)
+2.6.0 (2016-02-01)
 ++++++++++++++++++
 
 Features:

diff --git a/marshmallow/__init__.py b/marshmallow/__init__.py
@@ -13,7 +13,7 @@
 from marshmallow.utils import pprint, missing
 from marshmallow.exceptions import ValidationError
 
-__version__ = '2.6.0.dev0'
+__version__ = '2.6.0'
 __author__ = 'Steven Loria'
 
 __all__ = [