Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / doc / bugs / linkmap_displays_underscore_escapes.mdwn

diff --git a/doc/bugs/linkmap_displays_underscore_escapes.mdwn b/doc/bugs/linkmap_displays_underscore_escapes.mdwn
index 14164d0761edecfa6a55c048e882869fb1918493..16080358b1a01b0a8c9bd5a7c91add8bdb06bf30 100644 (file)
--- a/doc/bugs/linkmap_displays_underscore_escapes.mdwn
+++ b/doc/bugs/linkmap_displays_underscore_escapes.mdwn
@@ -33,3 +33,5 @@ the patch is stored in [[the patch.pl]] as created by git-format-patch, and can
 be pulled from the abovementioned branch.
 
 > update 2014-06-29: branch still merges cleanly and works. --[[chrysn]]
+
+>> [[merged|done]] --[[smcv]]