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/824f37d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/824f37d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/824f37d5 Branch: refs/heads/2.3 Commit: 824f37d5cd4fd9498e932e2201e4f8f649b65622 Parents: bc1455f 607c427 Author: ddekany <ddek...@apache.org> Authored: Fri Feb 9 01:26:06 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Fri Feb 9 01:26:06 2018 +0100 ---------------------------------------------------------------------- LICENSE | 21 +++++++++++ build.xml | 9 ++--- rat-excludes | 80 ++++++++++++++++++++++++++++++++++++++++++ src/dist/bin/LICENSE | 24 +++++++++++++ src/dist/bin/rat-excludes | 42 ++++++++++++++++++++++ 5 files changed, 172 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/824f37d5/build.xml ----------------------------------------------------------------------
