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/70eb7f18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/70eb7f18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/70eb7f18 Branch: refs/heads/2.3 Commit: 70eb7f18ba7063e9bb78e967c452112320530131 Parents: caece2f 7923f5c Author: ddekany <[email protected]> Authored: Thu Oct 5 10:12:56 2017 +0200 Committer: ddekany <[email protected]> Committed: Thu Oct 5 10:12:56 2017 +0200 ---------------------------------------------------------------------- build.xml | 2 +- src/main/resources/freemarker/version.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/70eb7f18/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/70eb7f18/src/main/resources/freemarker/version.properties ----------------------------------------------------------------------
