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/bc1455f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bc1455f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bc1455f5 Branch: refs/heads/2.3 Commit: bc1455f5281b1315239fad0a683e425b8efbc062 Parents: 4ffe4b3 4ba637f Author: ddekany <ddek...@apache.org> Authored: Sun Feb 4 13:09:45 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Sun Feb 4 13:09:45 2018 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/Environment.java | 6 +++ .../freemarker/ext/jsp/JspTagModelBase.java | 6 ++- .../freemarker/ext/jsp/TagTransformModel.java | 6 +++ .../template/TemplateModelException.java | 37 +++++++++++++-- src/manual/en_US/book.xml | 49 ++++++++++++++------ .../basic/WEB-INF/expected/customTags1.txt | 2 +- 6 files changed, 86 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
