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 2015/10/16 21:26:53 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/0286f236
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0286f236
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0286f236
Branch: refs/heads/2.3
Commit: 0286f23671b06efa4e64789d84f6a506993ef5a3
Parents: d07ad04 0256df5
Author: ddekany <dd...@apache.org>
Authored: Fri Oct 16 21:26:29 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Fri Oct 16 21:26:29 2015 +0200
----------------------------------------------------------------------
src/test/java/freemarker/cache/FileTemplateLoaderTest.java | 2 +-
src/test/java/freemarker/core/ASTTest.java | 7 ++++++-
src/test/java/freemarker/test/utility/FileTestCase.java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------