jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject [10/12] jspwiki git commit: Merge branch 'master' into JSPWIKI-1035
Date Sat, 31 Dec 2016 14:23:45 GMT
Merge branch 'master' into JSPWIKI-1035

# Conflicts:
#	ChangeLog


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

Branch: refs/heads/master
Commit: 67d7249b65bd02713f97da8a24c41d10bf0d50a2
Parents: 3a1773a f35556f
Author: Harry Metske <harry.metske@gmail.com>
Authored: Wed Dec 28 19:52:05 2016 +0100
Committer: Harry Metske <harry.metske@gmail.com>
Committed: Wed Dec 28 19:52:05 2016 +0100

----------------------------------------------------------------------
 ChangeLog                                       |  6 +++++
 .../apache/wiki/plugin/ReferredPagesPlugin.java | 23 +++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/67d7249b/ChangeLog
----------------------------------------------------------------------
diff --cc ChangeLog
index 70e0ae8,16db93c..bd03286
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
 +2016-12-26  Harry Metske (metskem@apache.org)
 +       * Fixed JSPWIKI-1035 - Get rid of jspwiki.baseURL
 +         fixed remaining unit tests
 +       * changed Release postfix from "svn" to "git"
 +
+ 2016-12-27  Dirk Frederickx (brushed AT apache DOT org)
+ 
+        * 2.10.3-svn-23.
+ 
+        * Fix nesting of ul/li in RefferedPAgesPlugin.
+ 
  2016-12-19  Dirk Frederickx (brushed AT apache DOT org)
  
         * 2.10.3-svn-22  Various HADDOCK updates & fixes.


Mime
View raw message