You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2021/07/16 21:34:57 UTC

[freemarker] branch FREEMARKER-35 updated (61de5d9 -> beb98ae)

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(-)

[freemarker] 01/01: Merge branch '2.3-gae' into FREEMARKER-35

Posted by dd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git

commit beb98ae287b3ee3ed1c6f50662825ad3facd0ca6
Merge: 61de5d9 0cfab23
Author: ddekany <dd...@apache.org>
AuthorDate: Fri Jul 16 23:34:36 2021 +0200

    Merge branch '2.3-gae' into FREEMARKER-35

 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(-)