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 <lukasz.len...@gmail.com> 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(-)