diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-07-31 10:28:26 +0200 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-07-31 10:28:26 +0200 |
commit | e78a8c2834e7ad880ab45d26db3a952df8465493 (patch) | |
tree | 66530e65b143bfe8dc25aca47968850b7115b3d9 | |
parent | f1a70921e3bfc0496b5564582a5a1463b7a98c09 (diff) | |
parent | d24f8b5c372445e433a32e37d9c11ecc53156516 (diff) | |
download | ikiwiki-e78a8c2834e7ad880ab45d26db3a952df8465493.tar ikiwiki-e78a8c2834e7ad880ab45d26db3a952df8465493.tar.gz |
Merge branch 'master' into staging
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 11a03c993..b7d782d76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.15) UNRELEASED; urgency=low pages (smcv) * pagestats: when making a tag cloud, don't emit links where the tag is unused (smcv) + * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm) -- Joey Hess <joeyh@debian.org> Tue, 02 Jun 2009 17:03:41 -0400 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 |