Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/todo/progressbar_plugin.mdwn b/doc/todo/progressbar_plugin.mdwn
index 263e7a69dcd3c580f04fcaa75c2cf5dfb32cd312..12aef5ebb6d890f05ea2106861b2c29b2f6c5ac6 100644 (file)
--- a/doc/todo/progressbar_plugin.mdwn
+++ b/doc/todo/progressbar_plugin.mdwn
@@ -128,3 +128,5 @@ Any comments? --[[Paweł|ptecza]]
 >>>>> --[[Paweł|ptecza]]
 
 >>>>>> Reviewed, looks excellent, added. [[done]] --[[Joey]]
+
+>>>>>>> Thanks a lot for you and Will! :) [[Paweł|ptecza]]