FREEMARKER-55: Merged: Add default tld sources Merge commit 'refs/pull/27/head' of https://github.com/apache/incubator-freemarker into 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/aaa100c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/aaa100c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/aaa100c0 Branch: refs/heads/3 Commit: aaa100c0cb032d5525129cd458bcf3fef73028a1 Parents: a715679 73a53e7 Author: ddekany <ddek...@apache.org> Authored: Fri Jul 14 12:45:57 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Fri Jul 14 12:47:36 2017 +0200 ---------------------------------------------------------------------- .../org/apache/freemarker/servlet/jsp/TaglibFactory.java | 10 +++++----- .../spring/web/view/FreemarkerViewResolver.java | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------