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 2018/03/16 13:13:25 UTC

[struts] 01/01: Merge pull request #204 from quaff/master

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 b39433aaa54bec3b593759a9631f4d38b4d2e7da
Merge: e2c2ea8 c3d8b47
Author: Lukasz Lenart <lu...@gmail.com>
AuthorDate: Fri Mar 16 14:13:21 2018 +0100

    Merge pull request #204 from quaff/master
    
    WW-4910 Align OptGroup with Select

 .../org/apache/struts2/components/ListUIBean.java  | 39 +++++++++--------
 .../org/apache/struts2/components/OptGroup.java    |  2 +-
 .../main/resources/template/simple/optgroup.ftl    | 15 ++++---
 .../freemarker/FreemarkerResultMockedTest.java     | 49 ++++++++++++++++++++++
 .../org/apache/struts2/views/freemarker/select.ftl | 28 +++++++++++++
 core/src/test/resources/struts.xml                 |  6 +++
 6 files changed, 113 insertions(+), 26 deletions(-)

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