Merge pull request #5 from apache/master update pull
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/46bd92fe Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/46bd92fe Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/46bd92fe Branch: refs/heads/master Commit: 46bd92fe202041c76704b96d11a0b8f8e83d56de Parents: 778eec3 cceb891 Author: victor sosa <[email protected]> Authored: Fri Jan 29 17:54:27 2016 -0400 Committer: victor sosa <[email protected]> Committed: Fri Jan 29 17:54:27 2016 -0400 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp | 7 +++---- .../struts2/convention/PackageBasedActionConfigBuilder.java | 6 +++++- .../apache/struts2/convention/annotation/AllowedMethods.java | 2 +- .../convention/actions/allowedmethods/package-info.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
