Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/ea6fcf97 Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/ea6fcf97 Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/ea6fcf97 Branch: refs/heads/2.3 Commit: ea6fcf97241219a1b0ad1a094e5df7e2de32dd13 Parents: 8ee391d 21bf6ae Author: ddekany <ddek...@apache.org> Authored: Thu Apr 5 11:44:35 2018 +0200 Committer: ddekany <ddek...@apache.org> Committed: Thu Apr 5 11:44:35 2018 +0200 ---------------------------------------------------------------------- build.xml | 3 +-- src/main/java/freemarker/template/Configuration.java | 3 +++ src/main/java/freemarker/template/_TemplateAPI.java | 2 ++ src/main/resources/freemarker/version.properties | 8 ++++---- src/manual/en_US/book.xml | 2 +- .../java/freemarker/template/DefaultObjectWrapperTest.java | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/freemarker/blob/ea6fcf97/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/freemarker/blob/ea6fcf97/src/main/resources/freemarker/version.properties ----------------------------------------------------------------------
