aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-12-12 14:24:35 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-12-12 14:24:35 -0500
commit07c9cddb50856d8f94c9618187227027a27fe4c8 (patch)
tree85857aed812341efbae725189031f2b9c4f7be6e
parent41efa5ac923c47ebd5538ee5894b11e9ccf7637c (diff)
parent1f43a4fccc8b3b7ad4947b3052cbd803275bcbf0 (diff)
downloadikiwiki-07c9cddb50856d8f94c9618187227027a27fe4c8.tar
ikiwiki-07c9cddb50856d8f94c9618187227027a27fe4c8.tar.gz
Merge branch 'master' into comments
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bf14860dd..76f00157d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
* inline: Support feedfile option to change the filename of the feed
generated.
* 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