This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch FREEMARKER-35 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit ad1171f0901c69568e91e7f8225886dc19ffb55b Merge: 744a5470 df938ce6 Author: ddekany <[email protected]> AuthorDate: Sat Jul 8 09:04:07 2023 +0200 Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35 # Conflicts: # src/test/java/freemarker/template/DefaultObjectWrapperTest.java build.xml | 5 - ivy.xml | 2 +- src/main/java/freemarker/core/PropertySetting.java | 10 +- .../freemarker/ext/beans/unsafeMethods.properties | 1 + src/manual/en_US/book.xml | 105 ++++++++++++++------- src/manual/en_US/docgen.cjson | 4 +- 6 files changed, 81 insertions(+), 46 deletions(-)
