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/a1e217a8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a1e217a8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a1e217a8 Branch: refs/heads/2.3 Commit: a1e217a8de8925691c544fd6a346d7ab4a3be038 Parents: 876fffc d4e4def Author: ddekany <[email protected]> Authored: Sat Mar 25 11:52:44 2017 +0100 Committer: ddekany <[email protected]> Committed: Sat Mar 25 11:52:44 2017 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/Configurable.java | 14 +++---- src/main/java/freemarker/core/Include.java | 2 +- .../freemarker/ext/beans/ClassIntrospector.java | 40 ++++++++++---------- .../java/freemarker/template/SimpleHash.java | 16 ++++---- .../freemarker/template/SimpleSequence.java | 16 ++++---- src/manual/en_US/book.xml | 4 +- 6 files changed, 44 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
