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 2017/10/05 08:13:16 UTC

[5/7] 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/caece2ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/caece2ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/caece2ff

Branch: refs/heads/2.3
Commit: caece2ff0400f1f7c445b95b41e19eb574328036
Parents: 06955e1 d37f513
Author: ddekany <dd...@apache.org>
Authored: Thu Oct 5 09:47:43 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Thu Oct 5 09:47:43 2017 +0200

----------------------------------------------------------------------
 README.md                                       |  9 ++--
 ivy.xml                                         |  4 +-
 src/main/java/freemarker/ext/dom/NodeModel.java | 33 +++++++-----
 src/manual/en_US/book.xml                       | 34 +++++++++---
 .../java/freemarker/core/SQLTimeZoneTest.java   |  8 +--
 .../templatesuite/templates/dateformat-java.ftl | 56 +++++++++++---------
 6 files changed, 90 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/caece2ff/src/manual/en_US/book.xml
----------------------------------------------------------------------