Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / todo / edittemplate_should_support_uuid__44___date_variables.mdwn

diff --git a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
index e5a8d0ab9eaf8a480a0aa35eeac856d8732a6e25..6d702fedf1032c9398f80cc526237307e6ee2149 100644 (file)
--- a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
+++ b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
@@ -83,3 +83,5 @@ Changes to the structure of `$pagestate{$registering_page}{edittemplate}{$pagesp
 >>>>> almost 5 years ago. Branch replaced by `smcv/ready/edittemplate2`
 >>>>> which drops `formatted_time` and `html_time`, and adds a suggestion
 >>>>> to use `\[[!date]]`. --[[smcv]]
+
+>>>>>> [[merged|done]] --[[smcv]]