Skip to content

Commit

Permalink
Preparing release 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
strichter committed Jul 24, 2014
1 parent 4ee69d1 commit 5be8fc4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGES.rst
Expand Up @@ -2,7 +2,7 @@
CHANGES
=======

2.6.0 (unreleased)
2.6.0 (2014-07-24)
------------------

- Implemented ability to use the ``mergePage`` tag inside the ``pageTemplate``
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -43,7 +43,7 @@ def alltests():

setup (
name='z3c.rml',
version='2.5.1.dev0',
version='2.6.0',
author="Stephan Richter and the Zope Community",
author_email="zope-dev@zope.org",
description="An alternative implementation of RML",
Expand Down

0 comments on commit 5be8fc4

Please sign in to comment.