Merge branch 'master' into plip1734thumbs

plone · Jun 1, 2017 · da05598 · da05598
2 parents a9f158c + e8069a8
commit da05598
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,7 +2,7 @@ Changelog
 =========
 
 
-3.4.1 (unreleased)
+3.4.2 (unreleased)
 ------------------
 
 Breaking changes:
@@ -18,6 +18,16 @@ New features:
   https://github.com/plone/Products.CMFPlone/issues/1734
   [fgrcon]
 
+Bug fixes:
+
+- *add item here*
+
+
+3.4.1 (2017-05-16)
+------------------
+
+New features:
+
 - Folder Contents: Construct the list of sortable indexes from the available catalog indexes, using a blacklist and a default set - likewise as it's done with metadata columns.
   [thet]
 
@@ -32,7 +42,9 @@ Bug fixes:
   current path
   [datakurre]
 
-
+- removed unittest2 dependency.
+  [kakshay21]
+
 3.4 (2017-04-01)
 ----------------
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,3 @@
-include *.txt
 include *.rst
 
 recursive-include docs *

diff --git a/plone/app/content/tests/test_namechooser_unit.py b/plone/app/content/tests/test_namechooser_unit.py
@@ -8,7 +8,7 @@
 from plone.dexterity.fti import DexterityFTI
 from zope.container.interfaces import INameChooser
 import transaction
-import unittest2 as unittest
+import unittest
 
 
 class NameChooserTest(unittest.TestCase):

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '3.4.1.dev0'
+version = '3.4.2.dev0'
 
 setup(
     name='plone.app.content',