Merge branch 'master' into comments

master
Joey Hess 2008-12-12 14:24:35 -05:00
commit 07c9cddb50
1 changed files with 1 additions and 0 deletions

1
debian/changelog vendored
View File

@ -14,6 +14,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
* inline: Support feedfile option to change the filename of the feed * inline: Support feedfile option to change the filename of the feed
generated. generated.
* meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect. * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
* htmlbalance: don't compact whitespace, and set misc other options (smcv)
-- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500 -- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500