From commits-return-18090-archive-asf-public=cust-asf.ponee.io@struts.apache.org Tue Oct 9 06:56:37 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 85575180668 for ; Tue, 9 Oct 2018 06:56:36 +0200 (CEST) Received: (qmail 921 invoked by uid 500); 9 Oct 2018 04:56:35 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 907 invoked by uid 99); 9 Oct 2018 04:56:35 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Oct 2018 04:56:35 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id DDF1D81E10; Tue, 9 Oct 2018 04:56:34 +0000 (UTC) Date: Tue, 09 Oct 2018 04:56:35 +0000 To: "commits@struts.apache.org" Subject: [struts] 01/01: Merge pull request #255 from JCgH4164838Gh792C124B5/localS2Branch MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: lukaszlenart@apache.org In-Reply-To: <153906099478.18157.5149951057058458545@gitbox.apache.org> References: <153906099478.18157.5149951057058458545@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: b7cc4b8c80b67c939a83e44d1eefaa2bc9bc5165 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181009045634.DDF1D81E10@gitbox.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.git commit b7cc4b8c80b67c939a83e44d1eefaa2bc9bc5165 Merge: 2ab2b9b 50d57e1 Author: Lukasz Lenart AuthorDate: Tue Oct 9 06:56:29 2018 +0200 Merge pull request #255 from JCgH4164838Gh792C124B5/localS2Branch Minor config fixes for the Showcase Application: apps/showcase/src/main/resources/struts-token.xml | 4 ++-- apps/showcase/src/main/resources/struts-validation.xml | 18 +++++++++--------- .../src/main/webapp/WEB-INF/token/example4.ftl | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)