Merge branch 'hotfix/1.0.0-alpha.2' into stable

* hotfix/1.0.0-alpha.2: Change release date. [ci skip] Require ``kotti_tinymce==0.5.1``. This fixes #365.
Kotti · Jan 1, 2015 · 07f4f37 · 07f4f37
2 parents 174829a + 8092fb3
commit 07f4f37
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+1.0.0-alpha.2 - 2015-01-01
+--------------------------
+
+- Require ``kotti_tinymce==0.5.1``.  This fixes #365.
+
 1.0.0-alpha - 2014-12-20
 ------------------------
 

diff --git a/requirements.txt b/requirements.txt
@@ -33,7 +33,7 @@ js.jquery_timepicker_addon==1.3-1
 js.jqueryui==1.10.3
 js.jqueryui_tagit==2.0.24-2
 js.modernizr==2.5.3.1
-kotti_tinymce==0.5.0
+kotti_tinymce==0.5.1
 lingua==3.6.1
 peppercorn==0.5
 plone.scale==1.3.4

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