Merge branch 'github-main' into jean-issue-497-OFS.Folder

plomino · Nov 29, 2013 · 2d37165 · 2d37165
2 parents dc2f3e8 + 5d4937d
commit 2d37165
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Products/CMFPlomino/version.txt b/Products/CMFPlomino/version.txt
@@ -1 +1 @@
-1.18.3
+1.18.4
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.18.4 (2013-11-29)
+-------------------
+* Fix few Chameleon compatibility issues
+* Improve document properties page
+* Split key column from sort column
+* Remove Close action from views
+
 1.18.3 (2013-11-04)
 -------------------
 * Fix getFieldValue

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '1.18.3'
+version = '1.18.4'
 
 setup(name='Products.CMFPlomino',
       version=version,