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/bfb836b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bfb836b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bfb836b2 Branch: refs/heads/2.3 Commit: bfb836b254f30cc2937e7dd1e60377c616cd5a7e Parents: a1e217a eb1bab9 Author: ddekany <[email protected]> Authored: Sun Mar 26 14:02:28 2017 +0200 Committer: ddekany <[email protected]> Committed: Sun Mar 26 14:02:28 2017 +0200 ---------------------------------------------------------------------- src/main/resources/freemarker/version.properties | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bfb836b2/src/main/resources/freemarker/version.properties ----------------------------------------------------------------------
