freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Sat, 26 Oct 2019 18:40:22 GMT
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 2ba7e9cb0f77196c6e63908708ac29bb4a8a8ddd
Merge: 26de3c4 ca68d7d
Author: ddekany <ddekany@apache.org>
AuthorDate: Sat Oct 26 20:40:00 2019 +0200

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

 src/main/java/freemarker/core/Macro.java           |  15 +-
 .../freemarker/template/utility/Constants.java     |  11 +-
 src/manual/en_US/book.xml                          | 248 ++++++++++++++++-----
 .../freemarker/core/ArgsSpecialVariableTest.java   |  25 ++-
 .../java/freemarker/manual/SpreadArgsExamples.java |  35 +++
 ...adArgsExamples-usingWithArgsSpecialVariable.ftl |  11 +
 ...gsExamples-usingWithArgsSpecialVariable.ftl.out |   4 +
 7 files changed, 280 insertions(+), 69 deletions(-)


Mime
View raw message