Merge branch 'master' into http-parameters
Conflicts:
core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/abd8c6bf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/abd8c6bf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/abd8c6bf
Branch: refs/heads/master
Commit: abd8c6bfb5fc3a9e3f9f3767bb10acd9b7c4836d
Parents: 8b60785 3163d6c
Author: Lukasz Lenart <lukasz.len...@gmail.com>
Authored: Tue Jan 19 16:21:00 2016 +0100
Committer: Lukasz Lenart <lukasz.len...@gmail.com>
Committed: Tue Jan 19 16:21:00 2016 +0100
----------------------------------------------------------------------
.../org/apache/struts2/json/JSONResultTest.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
