diff options
| author | intrigeri <intrigeri@boum.org> | 2010-07-24 11:19:28 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-07-24 11:19:28 +0200 |
| commit | 2f71e7f8f5a5c69753fb77c897d4446cdc23f856 (patch) | |
| tree | 144bd3fb2710042f8b9fddd9c47b05cad90e8ff9 /debian | |
| parent | d98296d1db02febfa7cc4fbe7f304ca2a9858fef (diff) | |
| parent | 11bd781a9dc8c04a005a04a99845ec339079b610 (diff) | |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index db828f580..0f6a7c810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,12 @@ -ikiwiki (3.20100705) UNRELEASED; urgency=low +ikiwiki (3.20100723) UNRELEASED; urgency=low + + * template: Fix dependency tracking. Broken in version 3.20100427. + * po: The po_slave_languages setting is now a list, so the order of + translated languages can be controlled. (intrigeri) + + -- Joey Hess <joeyh@debian.org> Fri, 23 Jul 2010 14:00:32 -0400 + +ikiwiki (3.20100722) unstable; urgency=low * img: Add a margin around images displayed by this directive. * comments: Added commentmoderation directive for easy linking to the @@ -20,10 +28,11 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low the caching problem that was added to work around). Closes: #588623 * Made much more robust in cases where multiple source files produce conflicting files/directories in the destdir. - * Updated French program translation from Philippe Batailler. Closes: #589423 + * Updated French translation from Philippe Batailler. Closes: #589423 * po: Fix selflink display on tranlsated pages. (intrigeri) + * Avoid showing 'Add a comment' link at the bottom of the comment post form. - -- Joey Hess <joeyh@debian.org> Mon, 05 Jul 2010 13:59:42 -0400 + -- Joey Hess <joeyh@debian.org> Thu, 22 Jul 2010 16:49:05 -0400 ikiwiki (3.20100704) unstable; urgency=low |