summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-12-25 12:38:31 -0400
committerJoey Hess <joey@kitenet.net>2010-12-25 12:38:31 -0400
commit77907fb380ee0bbc51c40dfd168be01f12550d9a (patch)
treec9687d0074fc6b73f621aa776e575488b0b314b1 /debian
parentc5f1c503cdac65a55e6a796c86fdcc9d0b9ad6d3 (diff)
merge po
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ea6356f72..4e9a92eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low
* inline: Display feed buttons for nested inlines, linking to the inlined
page's feed. (Giuseppe Bilotta)
* goldtype: New theme, based on blueview, contributed by Lars Wirzenius.
+ * po: do not override homepage title when it was overridden. (intrigeri)
+ * Set HTML::Template's parent_global_vars option to allow using parameters
+ like title_overridden that do not appear on the template. (intrigeri)
+ (See https://rt.cpan.org/Public/Bug/Display.html?id=64158)
-- Joey Hess <joeyh@debian.org> Mon, 29 Nov 2010 14:44:13 -0400