Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558

# Conflicts:
#	plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
This commit is contained in:
victorsosa
2016-02-15 10:37:26 -04:00
@@ -186,6 +186,7 @@ public class JSONInterceptor extends AbstractInterceptor {
return Action.NONE;
} else {
LOG.debug("Accept header parameter must be 'application/json' or 'application/json-rpc'. Ignoring request with accept ", accept);
}