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/a3fb59d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a3fb59d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a3fb59d6 Branch: refs/heads/2.3 Commit: a3fb59d69ac66bd5a72b665ad4c71df607aa63e1 Parents: 8bfb950 7f67e3d Author: ddekany <[email protected]> Authored: Wed Mar 15 14:58:24 2017 +0100 Committer: ddekany <[email protected]> Committed: Wed Mar 15 14:58:24 2017 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/ext/beans/BeansWrapper.java | 5 +++-- .../java/freemarker/ext/beans/BeansWrapperConfiguration.java | 6 +++++- src/main/java/freemarker/ext/beans/_BeansAPI.java | 4 ++++ src/manual/en_US/book.xml | 8 ++++++++ 4 files changed, 20 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
