Commit aa22e233 authored by Hanno Schlichting's avatar Hanno Schlichting

Merge branch '2.12' into 2.13

parents 910c54fc 32d84a23
......@@ -3,7 +3,7 @@ Changelog
This file contains change information for the current Zope release.
Change information for previous versions of Zope can be found at
http://docs.zope.org/zope2/releases/.
http://docs.zope.org/zope2/
2.13.21 (unreleased)
--------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment