both changes picked

master
Joey Hess 2009-08-28 07:34:09 -04:00
parent 5136c22eed
commit cc6000f0b9
2 changed files with 5 additions and 0 deletions

3
debian/changelog vendored
View File

@ -32,6 +32,9 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
* po: Fix name of translated toplevel index page. (intrigeri)
* po: Fix display of links from a translated page to itself (ntrigeri)
* Add Czech basewiki translation from Miroslav Kure.
* po: fix interdiction to create pages of type po (intrigeri)
* po: po: favor the type of linking page's masterpage on page creation
(intrigeri)
-- Joey Hess <joeyh@debian.org> Wed, 12 Aug 2009 12:25:30 -0400

View File

@ -330,6 +330,8 @@ This code favors the type of the linking page's masterpage on page
creation (when `from=page.LL`). This is commit c9301d2c296f682.
--[[intrigeri]]
> Both cherry picked. --[[Joey]]
Documentation
-------------