Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/todo/color_plugin.mdwn b/doc/todo/color_plugin.mdwn
index 6e6bcabacf8aeb1b63bc8f6157eded8338facbe3..69afe837d1f66ef8b5721c9357fc44487dd316b3 100644 (file)
--- a/doc/todo/color_plugin.mdwn
+++ b/doc/todo/color_plugin.mdwn
@@ -114,8 +114,9 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
 >>>> ready for integration (made a few minor changes). Is this GPL 2?
 >>>> --[[Joey]]
 
 >>>> ready for integration (made a few minor changes). Is this GPL 2?
 >>>> --[[Joey]]
 

->>>>> No problem. I know it, because I've seen the picture from your mountain
->>>>> vacation at your [blog](http://kitenet.net/~joey/blog/entry/vacation/) :D
+>>>>> No problem. I guessed it, because I've not seen your commits
+>>>>> at [[RecentChanges]] page in last days and I subscribe your
+>>>>> [blog](http://kitenet.net/~joey/blog/entry/vacation/) :D

 >>>>> It's GPL-2+ like your Ikiwiki and the most external plugins.
 >>>>> --[[Paweł|ptecza]]
 
 >>>>> It's GPL-2+ like your Ikiwiki and the most external plugins.
 >>>>> --[[Paweł|ptecza]]
 


@@ -226,3 +227,5 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
        +span.color {
        +       padding: 2px;
        +}
        +span.color {
        +       padding: 2px;
        +}

+
+[[done]]