attachment: Show files from underlay in attachments list.

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d66bcab2033ca6222f5539291067820af03589e2..4e120c62263c09c1097fec4c023ef62cd647b796 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20100611) UNRELEASED; urgency=low
+
+  * openid: Add openid_realm and openid_cgiurl configuration options,
+    useful in a few edge case setups.
+  * attachment: Show files from underlay in attachments list.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
+
 ikiwiki (3.20100610) unstable; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
@@ -9,8 +17,8 @@ ikiwiki (3.20100610) unstable; urgency=low
   * Fix display of sidebar when previewing page edit. (Thanks, privat)
   * relativedate: Fix problem with localised dates not working.
   * editpage: Avoid storing accidental state changes when previewing pages.
-  * page.tmpl: Add a div around the sidebar, page content, and comments,
-    to aide in styling.
+  * page.tmpl: Add a div around the page content, and comments, to aide in
+    sidebar styling.
   * style.css: Improvements to make floating sidebar fit much better on
     pages with inlines.
   * calendar: Shorten day names, and improve styling of month calendar.