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/10/23 22:52:28 UTC

[freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

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

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

commit 62f9a0f18376451d25d2fab05132d53c32b4f40f
Merge: 19690e2 b5d2d40
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Oct 24 00:52:08 2021 +0200

    Merge remote-tracking branch 'origin/2.3-gae' into 2.3

 build.xml                                          |  1 +
 ivy.xml                                            |  6 +-
 .../core/DefaultTruncateBuiltinAlgorithm.java      |  4 +-
 .../java/freemarker/ext/xml/NodeListModel.java     | 19 +++--
 .../java/freemarker/template/Configuration.java    |  3 +
 .../freemarker/template/TemplateException.java     |  4 +-
 .../java/freemarker/template/_TemplateAPI.java     |  1 +
 src/main/resources/freemarker/version.properties   |  8 +-
 src/manual/en_US/book.xml                          | 87 ++++++++++++++++------
 src/manual/zh_CN/book.xml                          |  8 +-
 .../template/DefaultObjectWrapperTest.java         |  1 +
 .../manual/AutoEscapingExample-convert.ftlh        |  2 +-
 .../manual/AutoEscapingExample-convert.ftlh.out    |  2 +-
 13 files changed, 97 insertions(+), 49 deletions(-)