summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-12-12 14:21:08 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-12-12 14:21:08 -0500
commit41efa5ac923c47ebd5538ee5894b11e9ccf7637c (patch)
treea3d15145b15092d731517d07c68484105bb07853 /debian
parent1942fc3bd652868ab8d6842c2bb2bdf52c0ad9fb (diff)
parent88e8d4bf8d99b6df83deb680f1ed8685e6447875 (diff)
Merge branch 'master' into comments
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1ff78d749..bf14860dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
* inline: Support emptyfeeds=no option to skip generating empty feeds.
* inline: Support feedfile option to change the filename of the feed
generated.
+ * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
-- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500