Fixed upstream => done.

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 0eaff10fce4e2d107c6eb679cf7e72cd5272551e..db6f95f43e6adab1882e8389e09d95d8030007ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20110329) UNRELEASED; urgency=low
+
+  * meta: Allow adding javascript to pages. Only when htmlscrubber is
+    disabled, naturally. (Thanks, Giuseppe Bilotta)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 28 Mar 2011 13:08:23 -0400
+
 ikiwiki (3.20110328) unstable; urgency=low
 
   * Yaml formatted setup files are now produced by default.
@@ -7,7 +14,7 @@ ikiwiki (3.20110328) unstable; urgency=low
   * comment: Better fix to avoid showing comments of subpages, while
     not breaking manual inlining of comments.
   * meta: Security fix; don't allow alternative stylesheets to be added
-    on pages where the htmlscrubber is enabled.
+    on pages where the htmlscrubber is enabled. CVE-2011-1401
 
  -- Joey Hess <joeyh@debian.org>  Mon, 28 Mar 2011 12:23:26 -0400