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 aa7e565269bf082146ad85123cdbb58b4517f4d8 Merge: 888dece 6beb29c Author: ddekany <[email protected]> AuthorDate: Sat Apr 11 09:51:08 2020 +0200 Merge branch '2.3-gae' into FREEMARKER-35 build.xml | 2 +- src/main/java/freemarker/core/Environment.java | 65 ++++++++------ .../ext/beans/BeansWrapperConfiguration.java | 7 ++ .../java/freemarker/template/Configuration.java | 17 +++- .../DefaultObjectWrapperConfiguration.java | 3 + .../java/freemarker/template/_TemplateAPI.java | 22 ++++- src/main/resources/freemarker/version.properties | 8 +- src/manual/en_US/book.xml | 99 ++++++++++++++++------ src/test/java/freemarker/manual/ExamplesTest.java | 3 +- .../freemarker/template/ConfigurationTest.java | 2 + src/test/resources/freemarker/core/ast-lambda.ast | 18 ++++ .../overloaded-methods-2-bwici-2.3.20.ftl | 2 +- 12 files changed, 189 insertions(+), 59 deletions(-)
