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 2c481cdbabf3ff96d095d7509532f8b2bebd1a25 Merge: d1aee1e 196d28d Author: ddekany <[email protected]> AuthorDate: Sun Feb 16 19:08:52 2020 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 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 | 56 ++++++++++++++++--- src/test/java/freemarker/manual/ExamplesTest.java | 3 +- src/test/resources/freemarker/core/ast-lambda.ast | 18 ++++++ .../overloaded-methods-2-bwici-2.3.20.ftl | 2 +- 11 files changed, 159 insertions(+), 44 deletions(-)
