You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2018/03/27 08:27:44 UTC

[4/4] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

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 <dd...@apache.org>
Authored: Tue Mar 27 10:27:31 2018 +0200
Committer: ddekany <dd...@apache.org>
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(-)
----------------------------------------------------------------------