Skip to content

Commit

Permalink
Merge branch '2.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hannosch
hannosch committed May 1, 2013
2 parents bbef09b + aa22e23 commit 1102bbd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/build
/develop
/develop-eggs
/dist
/eggs
/parts
/include/Acquisition
Expand Down
2 changes: 1 addition & 1 deletion doc/CHANGES.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/

4.0a1 (unreleased)
------------------
Expand Down

0 comments on commit 1102bbd

Please sign in to comment.