Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558 # Conflicts: # plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2fada1ec Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2fada1ec Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2fada1ec Branch: refs/heads/master Commit: 2fada1ec05e61dfb0b3e43ab447a7673d689c684 Parents: 0d49050 fab687a Author: victorsosa <victor.s...@peopleware.do> Authored: Mon Feb 15 10:34:15 2016 -0400 Committer: victorsosa <victor.s...@peopleware.do> Committed: Mon Feb 15 10:35:29 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
