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/402d6674 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/402d6674 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/402d6674 Branch: refs/heads/2.3 Commit: 402d66744f84a66b5a328613fce751e359d05165 Parents: 870b428 2a58032 Author: ddekany <[email protected]> Authored: Fri Jan 6 21:56:34 2017 +0100 Committer: ddekany <[email protected]> Committed: Fri Jan 6 21:56:34 2017 +0100 ---------------------------------------------------------------------- .gitignore | 4 ++-- src/manual/en_US/docgen-help/editors-readme.txt | 6 ++++++ src/manual/en_US/docgen.cjson | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
