From: Joey Hess <joey@kitenet.net>
Date: Sun, 5 Dec 2010 20:38:38 +0000 (-0400)
Subject: changelog
X-Git-Tag: 3.20101231~86
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/efe702479afc51b8364c58d9a2ed86ad1780b5ae?hp=bb8f76a4a04686def8cc6f21bcca80cb2cc3b2c9

changelog
---

diff --git a/debian/changelog b/debian/changelog
index b418fc993..fae2f15b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low
   * Now when users log in via https, ikiwiki sends a secure cookie, that can
     only be used over https. If the user switches to using http, they will
     need to re-login. (smcv)
+  * inline: Display feed buttons for nested inlines, linking to the inlined
+    page's feed. (Giuseppe Bilotta)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400