summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-12-01 20:36:07 -0400
committerJoey Hess <joey@kitenet.net>2010-12-01 20:36:07 -0400
commit017f335aff7df37d0a22f11f45fec05c5e446826 (patch)
treec96974fbfcfde1a1d44894eb8b9931c1f42ba32e /debian
parent971322bdb68b5afabde47650174fdd4673fed0a2 (diff)
parentdae4a144e7219ce596f9d96206176a3d1d1ad4a5 (diff)
Merge branch 'bugfix'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 33c2d3d07..ec85743a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20101201) unstable; urgency=low
+
+ * meta: Fix calling of htmlscrubber to pass the page parameter.
+ The change of the htmlscrubber to look at page rather than destpage
+ caused htmlscrubber_skip to not work for meta directives.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 01 Dec 2010 20:28:01 -0400
+
ikiwiki (3.20101130) UNRELEASED; urgency=low
* Better support for serving the same site on multiple urls. (Such as