You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/06/12 13:49:15 UTC

[03/20] struts git commit: Merge pull request #10 from apache/master

Merge pull request #10 from apache/master

pull update

Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6bb1ec67
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6bb1ec67
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6bb1ec67

Branch: refs/heads/master
Commit: 6bb1ec67ad539d4bf6850f8314ef521e06b8295e
Parents: a5d7163 f7364a5
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Fri Mar 4 18:07:16 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Fri Mar 4 18:07:16 2016 -0400

----------------------------------------------------------------------
 .../com/opensymphony/xwork2/util/LocalizedTextUtil.java     | 5 ++++-
 core/src/main/resources/template/simple/checkboxlist.ftl    | 7 ++++---
 core/src/main/resources/template/simple/radiomap.ftl        | 5 +++--
 .../apache/struts2/interceptor/CookieInterceptorTest.java   | 9 ---------
 pom.xml                                                     | 2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------