Merge branch 'release/1.2.0'

* release/1.2.0: Bump version.
Kotti · Sep 27, 2015 · 79151a8 · 79151a8
2 parents db288f4 + 0b2be3f
commit 79151a8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,7 +1,7 @@
 Change History
 ==============
 
-1.2.0 - unreleased
+1.2.0 - 2015-09-27
 ------------------
 
 - **Greatly** reduce the number of queries that are sent to the DB:

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
@@ -1 +1 @@
--r https://raw.githubusercontent.com/Kotti/Kotti/1.1.5/requirements.txt
+-r https://raw.githubusercontent.com/Kotti/Kotti/stable/requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.5
+Kotti==1.2.0
 Babel==2.1.1
 Beaker==1.7.0
 Chameleon==2.22

diff --git a/setup.py b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.6-dev',
+      version='1.2.0',
       description="A high-level, Pythonic web application framework based on Pyramid and SQLAlchemy.  It includes an extensible Content Management System called the Kotti CMS.",  # noqa
       long_description='\n\n'.join([README, AUTHORS, CHANGES]),
       classifiers=[