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 db747fb039d14349c2328a1baa230af45b1715f9 Merge: 6aa8e1ec 3b0de722 Author: ddekany <[email protected]> AuthorDate: Thu Apr 11 10:23:15 2024 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 .../src/main/java/freemarker/core/Environment.java | 2 +- .../java/freemarker/core/ListElseContainer.java | 2 +- .../freemarker/core/TemplateProcessingTracer.java | 2 +- .../java/freemarker/template/Configuration.java | 87 ++++++++++++++++------ .../core/TemplateProcessingTracerTest.java | 2 +- .../SetServletContextForTemplateLoadingTest.java | 51 +++++++++++++ 6 files changed, 121 insertions(+), 25 deletions(-)
