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 eaa65c9435b585936547783623e17229264b85f9 Merge: beb98ae b5d2d40 Author: ddekany <[email protected]> AuthorDate: Sun Oct 24 00:57:18 2021 +0200 Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35 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 | 73 +++++++++++++++++----- .../template/DefaultObjectWrapperTest.java | 1 + 10 files changed, 84 insertions(+), 36 deletions(-)
