summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-31 10:28:26 +0200
committerJoey Hess <joey@gnu.kitenet.net>2009-07-31 10:28:26 +0200
commite78a8c2834e7ad880ab45d26db3a952df8465493 (patch)
tree66530e65b143bfe8dc25aca47968850b7115b3d9 /doc
parentf1a70921e3bfc0496b5564582a5a1463b7a98c09 (diff)
parentd24f8b5c372445e433a32e37d9c11ecc53156516 (diff)
Merge branch 'master' into staging
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
index 0a67934aa..5e842ca7f 100644
--- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
+++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
@@ -68,6 +68,8 @@ Patch:
[[!template id=gitbranch author="[[harishcm]]" branch=smcv/ready/harishcm-map-fix]]
+> [[merged|done]] --[[Joey]]
+
Patch:
--- /usr/local/share/perl/5.8.8/IkiWiki/Plugin/map.pm