[Checkins] [zopefoundation/Zope] 6a7406: make "Unicode Conflict Resolution" available for `...

[Dieter Maurer]

  Branch: refs/heads/StringExpr__bytes_2_text#plone3145
  Home:   https://github.com/zopefoundation/Zope
  Commit: 6a740623cccf4c20b775f810ca65f7b28fa20355
      https://github.com/zopefoundation/Zope/commit/6a740623cccf4c20b775f810ca65f7b28fa20355
  Author: dieter <dieter at handshake.de>
  Date:   2020-07-09 (Thu, 09 Jul 2020)

  Changed paths:
    M CHANGES.rst
    M src/Products/PageTemplates/engine.py
    M src/Products/PageTemplates/tests/testZopePageTemplate.py

  Log Message:
  -----------
  make "Unicode Conflict Resolution" available for `chamelepn` rendering