[struts-site] branch master updated (7500948 -> 2ac078b)

[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-site.git.


    from 7500948  Merge pull request #86 from paulvi/patch-30
     add 0ed3a29  404 - redirect in 10sec
     add ca4f458  s
     new 2ac078b  Merge pull request #79 from paulvi/patch-24

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:
 source/404.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

[struts-site] 01/01: Merge pull request #79 from paulvi/patch-24

[lu...@apache.org]

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

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

commit 2ac078ba2f97e04befa9096e0bce6ae28369f765
Merge: 7500948 ca4f458
Author: Lukasz Lenart <lu...@gmail.com>
AuthorDate: Sat Dec 9 07:12:46 2017 +0100

    Merge pull request #79 from paulvi/patch-24
    
    404 - redirect in 10sec

 source/404.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc source/404.md
index 7aa6371,9a3f80b..0919130
--- a/source/404.md
+++ b/source/404.md
@@@ -10,9 -10,8 +10,9 @@@ The page was moved or never existed
  Use menu above to navigate or go to [home page](/).  
  If you noticed any site problem, typos, etc on any page, 
  please correct using "Edit on GitHub" button or check on <https://github.com/apache/struts-site>.
 +For example, some redirects are configured in [`.htaccess`](https://github.com/apache/struts-site/blob/master/source/.htaccess).
  
- You will be redirected to main page in 5 second.
+ You will be redirected to main page in 10 seconds.
  
  <script type="text/javascript">
      function redirectToHome() {

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