This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch FREEMARKER-154 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 078f77b01d4d34059e05f9100a067a63f586aebb Merge: 6f326a9 0ead56f Author: ddekany <[email protected]> AuthorDate: Sun Aug 30 14:18:06 2020 +0200 Merge remote-tracking branch 'origin/master' into FREEMARKER-154 freemarker-generator-cli/CHANGELOG.md | 4 +++- .../templates/accesslog/combined-access.ftl | 8 +++---- .../templates/csv/csv/gatling-user-credentials.ftl | 2 +- .../examples/templates/csv/html/transactions.ftl | 2 +- .../src/app/examples/templates/csv/shell/curl.ftl | 2 +- .../app/examples/templates/dataframe/example.ftl | 6 ++--- .../examples/templates/dataframe/html/print.ftl | 2 +- .../src/app/examples/templates/demo.ftl | 2 +- .../app/examples/templates/excel/csv/custom.ftl | 2 +- .../templates/json/csv/swagger-endpoints.ftl | 10 ++++---- .../templates/properties/csv/locker-test-users.ftl | 14 +++++------ .../app/examples/templates/tsv/fo/transactions.ftl | 2 +- .../freemarker/generator/cli/ManualTest.java | 27 +++++++++++----------- 13 files changed, 42 insertions(+), 41 deletions(-)
