You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2021/07/16 21:34:58 UTC

[freemarker] 01/01: Merge branch '2.3-gae' into FREEMARKER-35

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git

commit beb98ae287b3ee3ed1c6f50662825ad3facd0ca6
Merge: 61de5d9 0cfab23
Author: ddekany <dd...@apache.org>
AuthorDate: Fri Jul 16 23:34:36 2021 +0200

    Merge branch '2.3-gae' into FREEMARKER-35

 src/main/resources/freemarker/version.properties   |  8 +--
 src/manual/en_US/book.xml                          | 57 +++++++++++++++++-----
 src/manual/zh_CN/book.xml                          |  8 +--
 .../manual/AutoEscapingExample-convert.ftlh        |  2 +-
 .../manual/AutoEscapingExample-convert.ftlh.out    |  2 +-
 5 files changed, 54 insertions(+), 23 deletions(-)