diff options
author | Joey Hess <joey@kitenet.net> | 2012-04-18 15:46:47 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-04-18 15:46:47 -0400 |
commit | 7f0d58fce37d0136068917bacbf77e8cdb4358d8 (patch) | |
tree | b67a8e1e87723a923c93844eb8ea99cca6185433 | |
parent | ae083783dfdaac05ec6b089771ed159f9246889c (diff) | |
download | ikiwiki-7f0d58fce37d0136068917bacbf77e8cdb4358d8.tar ikiwiki-7f0d58fce37d0136068917bacbf77e8cdb4358d8.tar.gz |
merged smcv/ready/trail
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | doc/plugins/trail/discussion.mdwn | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 689197aea..457bd6a67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ ikiwiki (3.20120204) UNRELEASED; urgency=low in the pages parameter. (smcv) * link: Fix renaming wikilinks that contain embedded urls. * graphviz: Handle self-links. + * trail: Improve CSS, also display trail links at bottom of page, + and a bug fix. (smcv) -- Joey Hess <joeyh@debian.org> Wed, 21 Mar 2012 14:33:14 -0400 diff --git a/doc/plugins/trail/discussion.mdwn b/doc/plugins/trail/discussion.mdwn index 4218553bb..7598ed219 100644 --- a/doc/plugins/trail/discussion.mdwn +++ b/doc/plugins/trail/discussion.mdwn @@ -101,3 +101,5 @@ Some later changes to trail: * Fix a possible bug regarding state deletion --[[smcv]] + +> Applied --[[Joey]] |