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 b80b6322b51354bd0b6cc4f0cb2db7a4ebfad15e Merge: e3e3185 88ebbaa Author: ddekany <[email protected]> AuthorDate: Sat Apr 11 18:04:32 2020 +0200 Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35 src/main/java/freemarker/template/Configuration.java | 3 +++ src/main/java/freemarker/template/_TemplateAPI.java | 1 + src/main/resources/freemarker/version.properties | 8 ++++---- src/test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 + 4 files changed, 9 insertions(+), 4 deletions(-)
