X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fchangelog;h=948fdcc8445c48734dd6adaeb0050c46dbd7ce5b;hb=86519b047e6fb96e4c5c5b22cb9619d120bf566e;hp=842eb680677c0a4c3bddec4397c6632649a41230;hpb=6bd8c6732e7ccda0013a3373c3618fca91c91d36;p=ikiwiki.git

diff --git a/debian/changelog b/debian/changelog
index 842eb6806..948fdcc84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,28 @@
-ikiwiki (3.20120726) UNRELEASED; urgency=low
+ikiwiki (3.20121213) UNRELEASED; urgency=low
+
+  * htmlscrubber: Allow the bitcoin URI scheme.
+  * aggregate: When run with --aggregate, if an aggregation is already
+    running, don't go on and --refresh.
+  * trail: Converted all dependencies to presence dependencies.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400
+
+ikiwiki (3.20121212) unstable; urgency=low
+
+  * filecheck: Fix bug that prevented File::MimeInfo::Magic from ever
+    being used.
+  * openid: Display openid in Preferences page as a comment, so it can be
+    selected in all browsers.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 11 Dec 2012 12:12:12 -0400
+
+ikiwiki (3.20121017) unstable; urgency=low
+
+  * recentchangesdiff: fix further breakage to the template from 3.20120725 
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 16 Oct 2012 20:49:27 -0400
+
+ikiwiki (3.20121016) unstable; urgency=low
 
   * monochrome: New theme, contributed by Jon Dowland.
   * rst: Ported to python 3, while still also being valid python 2.
@@ -11,8 +35,12 @@ ikiwiki (3.20120726) UNRELEASED; urgency=low
     page for a configurable number of seconds, which then redirects to retry.
     To enable this protection, set cgi_overload_delay to the number of
     seconds to wait. This is not enabled by default.
+  * Add back a 1em margin between archivepage divs.
+  * recentchangesdiff: Correct broken template that resulted in duplicate
+    diff icons being displayed, and bloated the recentchanges page with
+    inline diffs when the configuration should have not allowed them.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 30 Aug 2012 11:56:12 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 16 Oct 2012 15:14:19 -0400
 
 ikiwiki (3.20120725) unstable; urgency=low