Merge branch 'master' into fancypodcast

[git.ikiwiki.info.git] / doc / users / Gianpaolo_Macario.mdwn

diff --git a/doc/users/Gianpaolo_Macario.mdwn b/doc/users/Gianpaolo_Macario.mdwn
index c3dc7bbd11ff902844922cd93ec85ca7be374569..203d75d28a0bce850dc8eb98d72d909697f37875 100644 (file)
--- a/doc/users/Gianpaolo_Macario.mdwn
+++ b/doc/users/Gianpaolo_Macario.mdwn
@@ -10,3 +10,5 @@ I have browsed <http://www.wikimatrix.org/compare/ikiwiki+MediaWiki>, but I am s
 So the best way is actually trying it, isn't it?
 
 I would also try integrating Ikiwiki with [Infinote](http://infinote.org/) (or perhaps [jinfinote](http://www.jinfinote.com/)), in order to allow concurrent editing of pages.
 So the best way is actually trying it, isn't it?
 
 I would also try integrating Ikiwiki with [Infinote](http://infinote.org/) (or perhaps [jinfinote](http://www.jinfinote.com/)), in order to allow concurrent editing of pages.

+
+-- [Gianpaolo Macario](http://gmacario.altervista.org/)