Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / todo / po:_add_lang_name_and_code_template_variables.mdwn

diff --git a/doc/todo/po:_add_lang_name_and_code_template_variables.mdwn b/doc/todo/po:_add_lang_name_and_code_template_variables.mdwn
index 83e5d799b707430174d8c4fd88d119c6fdfc0dc7..1617e49140c79954af3746409a5ef7bd4ee4ef20 100644 (file)
--- a/doc/todo/po:_add_lang_name_and_code_template_variables.mdwn
+++ b/doc/todo/po:_add_lang_name_and_code_template_variables.mdwn
@@ -2,9 +2,6 @@ My po branch adds two new template variables: `lang_code` and
 `lang_name`, that respectively display the current page's language
 codename and pretty name. Please review and pull. --[[intrigeri]]
 
-[[patch]]
-
-> I think you forgot to push that to your public repo; see no unmerged
-> changes on `intrigeri/po` --[[Joey]] 
+> [[done]] --[[Joey]] 
 
->> Right. This was fixed. --[[intrigeri]]
+[[patch]]