aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-29 15:54:45 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-29 15:54:45 -0400
commit12c5786df4e74c143f24398b8d0028000b61daba (patch)
treea0f3136499610571b47289f6aa55659094024620 /debian
parent73af360e994306c1d0b14a69a4aa04750e61f0ef (diff)
parent106578f524a7ef8184029ac393dbe9d68b017756 (diff)
downloadikiwiki-12c5786df4e74c143f24398b8d0028000b61daba.tar
ikiwiki-12c5786df4e74c143f24398b8d0028000b61daba.tar.gz
Merge branch 'tova' into autoconfig
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 7b4bc4215..c4e4b7f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,13 @@ ikiwiki (2.60) UNRELEASED; urgency=low
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
+ikiwiki (2.56) UNRELEASED; urgency=low
+
+ * autoindex: New plugin that generates missing index pages.
+ (Sponsored by The TOVA Company.)
+
+ -- Joey Hess <joeyh@debian.org> Tue, 29 Jul 2008 15:53:26 -0400
+
ikiwiki (2.55) unstable; urgency=low
* remove: New plugin that adds the ability to remove pages via the web.