Merge branch 'release/1.1.0'

* release/1.1.0: Bump version.
Kotti · Apr 16, 2015 · a746557 · a746557
2 parents f63c39f + 9b3d8b5
commit a746557
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,8 +1,8 @@
 Change History
 ==============
 
-1.1.0-alpha.2 - unreleased
---------------------------
+1.1.0 2015-04-16
+----------------
 
 - Separate the default actions to a ``kotti.resources.default_actions``
   variable, to allows easier customization of default actions of all

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.0-alpha.1
+Kotti==1.1.0
 filedepot==0.0.3
 Babel==1.3
 Beaker==1.6.5.post1

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.1.0-alpha.1
+Kotti==1.1.0
 filedepot==0.0.3
 Babel==1.3
 Beaker==1.6.5.post1

diff --git a/setup.py b/setup.py
@@ -87,7 +87,7 @@
     install_requires.append('ordereddict')
 
 setup(name='Kotti',
-      version='1.1.0-alpha.2.dev',
+      version='1.1.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=[