You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2016/12/31 14:23:39 UTC

[04/12] jspwiki git commit: Merge branch 'master' into JSPWIKI-1035

Merge branch 'master' into JSPWIKI-1035


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/c4044360
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/c4044360
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/c4044360

Branch: refs/heads/master
Commit: c40443601ba67e8bf5d203b9fea2c7b88c682c04
Parents: d5b597e 014dc67
Author: Harry Metske <ha...@gmail.com>
Authored: Sat Dec 17 13:34:13 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Sat Dec 17 13:34:13 2016 +0100

----------------------------------------------------------------------
 ChangeLog                                       | 15 +++++
 .../src/main/java/org/apache/wiki/Release.java  |  2 +-
 .../main/java/org/apache/wiki/plugin/Image.java | 36 +++++++-----
 .../java/org/apache/wiki/util/XhtmlUtil.java    | 60 ++++++++++----------
 .../main/styles/haddock/default/Category.less   |  4 +-
 .../styles/haddock/default/Template.View.less   | 11 +++-
 .../main/styles/haddock/default/variables.less  |  2 +-
 7 files changed, 78 insertions(+), 52 deletions(-)
----------------------------------------------------------------------