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:41 UTC
[06/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/a5224087
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/a5224087
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/a5224087
Branch: refs/heads/master
Commit: a522408775316a9501799bce3830dbf5a20ec532
Parents: 10596bd 82949d6
Author: Harry Metske <ha...@gmail.com>
Authored: Tue Dec 20 19:16:59 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Tue Dec 20 19:16:59 2016 +0100
----------------------------------------------------------------------
ChangeLog | 15 +++++++++++++++
.../src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 12 ++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------