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 26de3c428981f8c42d2524b3e72b305d566c703b Merge: 2070477 7e6b0c0 Author: ddekany <[email protected]> AuthorDate: Thu Oct 24 00:09:11 2019 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 src/main/java/freemarker/core/BuiltinVariable.java | 30 ++-- src/main/java/freemarker/core/Environment.java | 3 +- src/main/java/freemarker/core/Macro.java | 160 ++++++++++++++++----- src/main/java/freemarker/template/SimpleHash.java | 22 +++ src/main/javacc/FTL.jj | 13 +- src/manual/en_US/book.xml | 125 +++++++++++++++- .../freemarker/core/ArgsSpecialVariableTest.java | 160 +++++++++++++++++++++ 7 files changed, 465 insertions(+), 48 deletions(-)
