Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 4e16140cb4eac8d2a0e4c6db376aa6b97588020c..87a280ed038aed378b490624f96011703d0ad8ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-ikiwiki (3.20110124) UNRELEASED; urgency=low
+ikiwiki (3.20110125) UNRELEASED; urgency=low
+
+  * editpage: Avoid inheriting internal page types.
+  * htmltidy: Avoid breaking the sidebar when websetup is running.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 01 Feb 2011 21:00:57 -0400
+
+ikiwiki (3.20110124) unstable; urgency=low

 
   * comments: Fix commenting, broken by security fix.
   * blogspam: Don't check modifications from admins for spam, and also
 
   * comments: Fix commenting, broken by security fix.
   * blogspam: Don't check modifications from admins for spam, and also


@@ -6,7 +13,7 @@ ikiwiki (3.20110124) UNRELEASED; urgency=low
   * inline: Fix regression in feed titles. Closes: #610878
     (Thanks, Paul Wise)
 
   * inline: Fix regression in feed titles. Closes: #610878
     (Thanks, Paul Wise)
 

- -- Joey Hess <joeyh@debian.org>  Mon, 24 Jan 2011 16:56:05 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 24 Jan 2011 17:07:44 -0400

 
 ikiwiki (3.20110123) unstable; urgency=low
 
 
 ikiwiki (3.20110123) unstable; urgency=low