Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/52bd103b Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/52bd103b Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/52bd103b Branch: refs/heads/2.3 Commit: 52bd103bc3ef4c8369b3d906779118e64edaff01 Parents: 5d3d608 b5c3742 Author: ddekany <[email protected]> Authored: Tue Mar 27 10:27:31 2018 +0200 Committer: ddekany <[email protected]> Committed: Tue Mar 27 10:27:31 2018 +0200 ---------------------------------------------------------------------- .../core/GetOptionalTemplateMethod.java | 4 +- src/manual/en_US/book.xml | 40 +++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
