Merge remote branch 'upstream/master' into prv/po

[ikiwiki.git] / doc / plugins / contrib / ymlfront / discussion.mdwn

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index 3ad02af296b39f166556066ae80d439795c0f7b5..b5c08fedd23b0fa0a1cbd21dc97bf14ba198f7bb 100644 (file)
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -9,3 +9,5 @@ Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
 >> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a
 >> different checkout. I've put it back; it's a branch from your `ikiplugins.git`,
 >> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]]
+
+>>> Done a while back, but now I've actually pushed to my repo. --[[KathrynAndersen]]