This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from 61de5d9 Merge remote-tracking branch 'origin/2.3-gae' into
FREEMARKER-35
add fe119a4 Updated version.properties
add 8d15d85 Manual: Updated release date
add 16df1b4 Manual: Cleaner ?chop_linebreak description.
add 5f2da02 Added build related changes to version history.
add 3bc5753 Manual: Finalized release date. Some version history
refinement.
add 75f3996 Manual: Fix HTLM typos
add 201533e Merge pull request #73 from agriffis/fix-htlm-typos
add a3b88c1 fix typo 'TemplatException' to 'TemplateException'
add 0cfab23 Merge pull request #75 from ILyaCyclone/2.3-gae
new beb98ae Merge branch '2.3-gae' into FREEMARKER-35
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/resources/freemarker/version.properties | 8 +--
src/manual/en_US/book.xml | 57 +++++++++++++++++-----
src/manual/zh_CN/book.xml | 8 +--
.../manual/AutoEscapingExample-convert.ftlh | 2 +-
.../manual/AutoEscapingExample-convert.ftlh.out | 2 +-
5 files changed, 54 insertions(+), 23 deletions(-)
