This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git


    from e169fce6 Fixed description in non-GAE POM
     add de37405f Re-enable bare `<sep>` when incompatibleImprovements < 2.3.34.
     add 69cf6165 Merge pull request #120 from 
nolaviz/sep-incompatible-improvements
     add 55ffb5ef Adjusted last merged PR: incompatibleImprovements 2.3.24 -> 
2.3.34. Added more JUnit tests. Updated version history.
     add e2636047 Adjusted description in the generated pom.xml
     new 7926e977 Merge remote-tracking branch 'origin/2.3-gae' into 2.3

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:
 build.gradle.kts                                     |  2 +-
 .../main/java/freemarker/template/_VersionInts.java  |  1 +
 .../src/main/javacc/freemarker/core/FTL.jj           |  4 +++-
 .../test/java/freemarker/core/SepParsingBugTest.java | 19 +++++++++++++++++++
 freemarker-manual/src/main/docgen/en_US/book.xml     | 20 +++++++++++++-------
 5 files changed, 37 insertions(+), 9 deletions(-)

Reply via email to