Skip to content

Commit

Permalink
Merge branch 'master' of github.com:zopefoundation/Zope
Browse files Browse the repository at this point in the history
  • Loading branch information
dataflake committed Jul 10, 2020
2 parents cd027c8 + 043eec7 commit 0ce2d72
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
------------------


- Make "chameleon-zope context wrapping" more faithful
- Make "chameleon-zope context wrapping" more faithful.
(`#873 <https://github.com/zopefoundation/Zope/pull/873/files>`_)

- Let "unicode conflict resolution" work for all templates (not just
``ZopePageTemplate``).
Expand Down

0 comments on commit 0ce2d72

Please sign in to comment.