Commit 1102bbd4 authored by Hanno Schlichting's avatar Hanno Schlichting

Merge branch '2.13'

parents bbef09b4 aa22e233
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
/build /build
/develop /develop
/develop-eggs /develop-eggs
/dist
/eggs /eggs
/parts /parts
/include/Acquisition /include/Acquisition
......
...@@ -3,7 +3,7 @@ Changelog ...@@ -3,7 +3,7 @@ Changelog
This file contains change information for the current Zope release. This file contains change information for the current Zope release.
Change information for previous versions of Zope can be found at Change information for previous versions of Zope can be found at
http://docs.zope.org/zope2/releases/. http://docs.zope.org/zope2/
4.0a1 (unreleased) 4.0a1 (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