[struts-examples] branch master updated (41bfd82 -> 1998893)

2017-12-02 Thread sdutry
This is an automated email from the ASF dual-hosted git repository.

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


from 41bfd82  Merge pull request #22 from fanofxiaofeng/patch-2
 add ab98a5e  replace 'the' with 'then' in 8 struts.xml files
 new 1998893  Merge pull request #23 from fanofxiaofeng/master

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:
 coding-actions/src/main/resources/struts.xml | 2 +-
 debugging-struts/src/main/resources/struts.xml   | 4 ++--
 exception-handling/src/main/resources/struts.xml | 4 ++--
 form-processing/src/main/resources/struts.xml| 2 +-
 form-validation/src/main/resources/struts.xml| 4 ++--
 http-session/src/main/resources/struts.xml   | 4 ++--
 message-resource/src/main/resources/struts.xml   | 4 ++--
 using-tags/src/main/resources/struts.xml | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-examples] 01/01: Merge pull request #23 from fanofxiaofeng/master

2017-12-02 Thread sdutry
This is an automated email from the ASF dual-hosted git repository.

sdutry pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git

commit 1998893de76ac3242e6cf235cc92744b629fbf35
Merge: 41bfd82 ab98a5e
Author: Stefaan Dutry 
AuthorDate: Sat Dec 2 17:19:31 2017 +0100

Merge pull request #23 from fanofxiaofeng/master

replace 'the' with 'then' in 8 struts.xml files

 coding-actions/src/main/resources/struts.xml | 2 +-
 debugging-struts/src/main/resources/struts.xml   | 4 ++--
 exception-handling/src/main/resources/struts.xml | 4 ++--
 form-processing/src/main/resources/struts.xml| 2 +-
 form-validation/src/main/resources/struts.xml| 4 ++--
 http-session/src/main/resources/struts.xml   | 4 ++--
 message-resource/src/main/resources/struts.xml   | 4 ++--
 using-tags/src/main/resources/struts.xml | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .