aboutsummaryrefslogtreecommitdiff
path: root/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2014-09-12 22:02:54 +0100
committerSimon McVittie <smcv@debian.org>2014-09-12 22:02:54 +0100
commitfdfd5ffac7fc3f43868b36b68bf39f7a8c3ab3ed (patch)
tree4f86a45f420dc1aa2273cca89d21ccf0d47d64be /doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
parent9be3f951166e5d1256a806a8db25b7c5c7021acb (diff)
downloadikiwiki-fdfd5ffac7fc3f43868b36b68bf39f7a8c3ab3ed.tar
ikiwiki-fdfd5ffac7fc3f43868b36b68bf39f7a8c3ab3ed.tar.gz
more bug-closing
Diffstat (limited to 'doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn')
-rw-r--r--doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn2
1 files changed, 2 insertions, 0 deletions
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 e5a8d0ab9..6d702fedf 100644
--- 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]]