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/876fffcf Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/876fffcf Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/876fffcf Branch: refs/heads/2.3 Commit: 876fffcfaf66bd212b02a931fdd2c69f6e0c297e Parents: a3fb59d 4356485 Author: ddekany <[email protected]> Authored: Wed Mar 15 21:04:30 2017 +0100 Committer: ddekany <[email protected]> Committed: Wed Mar 15 21:04:30 2017 +0100 ---------------------------------------------------------------------- build.xml | 10 +---- osgi.bnd | 4 +- .../resources/freemarker/version.properties | 8 ++-- src/manual/en_US/book.xml | 47 ++++++++++++-------- 4 files changed, 36 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/876fffcf/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/876fffcf/src/main/resources/freemarker/version.properties ----------------------------------------------------------------------
