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/c7f2ad6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c7f2ad6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c7f2ad6e Branch: refs/heads/2.3 Commit: c7f2ad6ea44c3202c3f1785f6f41f36cb3fcba1e Parents: 5377aad def5937 Author: ddekany <[email protected]> Authored: Sat Jan 2 15:13:52 2016 +0100 Committer: ddekany <[email protected]> Committed: Sat Jan 2 15:15:20 2016 +0100 ---------------------------------------------------------------------- README | 13 +++- RELEASE-NOTES | 8 ++- src/dist/bin/documentation/index.html | 4 +- .../resources/freemarker/version.properties | 12 ++-- src/manual/en_US/book.xml | 69 ++++++++++++++------ .../java/freemarker/template/VersionTest.java | 18 +++++ 6 files changed, 93 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c7f2ad6e/src/main/resources/freemarker/version.properties ----------------------------------------------------------------------
