[struts] branch master updated (d87c4d2ec -> 639f6f22e)

[lu...@apache.org]

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

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


    from d87c4d2ec Merge pull request #680 from apache/WW-5304-depreacted
     new 6f5aee13c Improve doc on s:datetextfield
     new 16df73750 renamed datetext.ftl to datetextfield.ftl to align with the intended behaviour see https://issues.apache.org/jira/browse/WW-4434
     new 639f6f22e Merge pull request #682 from fischey/master

The 6591 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:
 .../resources/template/simple/{datetext.ftl => datetextfield.ftl}    | 2 +-
 .../resources/template/xhtml/{datetext.ftl => datetextfield.ftl}     | 2 +-
 core/src/site/resources/tags/datetextfield.html                      | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename core/src/main/resources/template/simple/{datetext.ftl => datetextfield.ftl} (92%)
 rename core/src/main/resources/template/xhtml/{datetext.ftl => datetextfield.ftl} (93%)