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 133d53c3b521a5e5be1ba8fb9518b1bc461d6e11 Merge: c96660e6 b08bee6e Author: ddekany <[email protected]> AuthorDate: Thu Jan 5 13:49:51 2023 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 .../core/CombinedMarkupOutputFormat.java | 5 ++++ src/main/java/freemarker/core/Configurable.java | 4 +-- src/main/java/freemarker/core/DollarVariable.java | 10 +++++-- .../java/freemarker/core/MarkupOutputFormat.java | 12 ++++++++ src/main/java/freemarker/core/OutputFormat.java | 20 +++++++++----- .../ext/beans/DefaultMemberAccessPolicy-rules | 2 +- .../freemarker/ext/beans/unsafeMethods.properties | 5 ++-- src/main/resources/freemarker/version.properties | 8 +++--- src/manual/en_US/book.xml | 32 +++++++++++++++++++--- .../java/freemarker/core/DummyOutputFormat.java | 18 +++++++++++- .../java/freemarker/core/OutputFormatTest.java | 9 ++++++ 11 files changed, 100 insertions(+), 25 deletions(-)
