Merge branch 'release/1.3.1'

Kotti · Jan 17, 2018 · 7df0b39 · 7df0b39
2 parents 1757b65 + cbff4e5
commit 7df0b39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-1.3.1.dev0 - unreleased
------------------------
+1.3.1 - 2018-01-17
+------------------
 
 - When rendering slot views, use ``request.blank()`` to create the request.
   This is the proper behaviour, in tune with customizing

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 
-version = '1.3.1.dev0'
+version = '1.3.1'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."