You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@freemarker.apache.org by dd...@apache.org on 2019/07/01 07:03:49 UTC

[freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

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 5faee1132fad60c9b4dcd4ff8fd703e6c437cf33
Merge: 0170b80 2d61970
Author: ddekany <dd...@apache.org>
AuthorDate: Mon Jul 1 08:47:36 2019 +0200

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

 src/main/java/freemarker/core/BodyInstruction.java |   7 +-
 src/main/java/freemarker/core/Configurable.java    |  13 ++-
 src/main/java/freemarker/core/Environment.java     |  26 +++--
 src/main/java/freemarker/core/IteratorBlock.java   |  10 +-
 .../freemarker/core/LocalLambdaExpression.java     |   3 +-
 .../java/freemarker/core/NullTemplateModel.java    |  39 +++++++
 .../java/freemarker/ext/beans/BeansWrapper.java    |   2 +-
 .../java/freemarker/template/Configuration.java    |  47 ++++++++-
 .../java/freemarker/core/NullTransparencyTest.java | 113 +++++++++++++++++++++
 9 files changed, 243 insertions(+), 17 deletions(-)