Merge commit 'schmonz/master' into cvs

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

diff --git a/doc/todo/Add_showdown_GUI_input__47__edit.mdwn b/doc/todo/Add_showdown_GUI_input__47__edit.mdwn
index e864f53513deaf9ced22901dd36f856c20e6a462..7e7947fbce94d1a73d723df26299f335a0ef2b29 100644 (file)
--- a/doc/todo/Add_showdown_GUI_input__47__edit.mdwn
+++ b/doc/todo/Add_showdown_GUI_input__47__edit.mdwn
@@ -27,3 +27,5 @@ A demo is at <http://www.attacklab.net/showdown-gui.html>
 >>> be necessary to insert some sort of placeholder, perhaps by outputting
 >>> the text in monospace form w/ a lighter font to denote that it won't
 >>> directly be shown in the page... -- [[harningt]]
+
+>>>>> We have a wmd plugin now. --[[Joey]]