Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/bugs/pages_under_templates_are_invalid.mdwn b/doc/bugs/pages_under_templates_are_invalid.mdwn
index c031543c111d5ee0ec9c662379d50eef9eb57164..20d711fcb51a2d5e53ba015e61bd7055dd4cd299 100644 (file)
--- a/doc/bugs/pages_under_templates_are_invalid.mdwn
+++ b/doc/bugs/pages_under_templates_are_invalid.mdwn
@@ -17,3 +17,5 @@ Maybe just encode all < and > when compling pages within the templates fol
 
 >> My `templatebody` branch on [[template creation error]] fixes this.
 >> --[[smcv]]
 
 >> My `templatebody` branch on [[template creation error]] fixes this.
 >> --[[smcv]]

+
+>>> [[Merged|done]] --[[smcv]]