Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / users / xma / discussion.mdwn

diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn
index c2bb62062b072480a81be19106e72451d6ab5f06..34adbf82176e14c680e60e2039a77781b8534bf2 100644 (file)
--- a/doc/users/xma/discussion.mdwn
+++ b/doc/users/xma/discussion.mdwn
@@ -14,3 +14,5 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there
 > for ikiwiki. --[[Joey]]
 
 > > I'll think about it. It may solve some of my offline-being issues. --[[intrigeri]]
+
+>>>> Now developed! --[[Joey]]