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/e7190942 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e7190942 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e7190942 Branch: refs/heads/2.3 Commit: e719094290af90607c29d1b468a7e8a95c6cc273 Parents: 70eb7f1 bd7498e Author: ddekany <[email protected]> Authored: Fri Oct 6 21:35:20 2017 +0200 Committer: ddekany <[email protected]> Committed: Fri Oct 6 21:35:20 2017 +0200 ---------------------------------------------------------------------- .../freemarker/ext/beans/UnsafeMethods.java | 6 +- .../java/freemarker/ext/jsp/TaglibFactory.java | 15 +---- .../java/freemarker/template/Configuration.java | 68 ++++++++++---------- .../freemarker/template/utility/ClassUtil.java | 48 ++++++++++++++ src/manual/en_US/book.xml | 20 ++++++ 5 files changed, 104 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e7190942/src/manual/en_US/book.xml ----------------------------------------------------------------------
