Merge branch 'master' of ssh://git.ikiwiki.info

2014-02-10 11:59:52 -04:00 · 2014-02-10 11:59:52 -04:00 · 00016e0006
parent 809a276546 a52dbe92ec
commit 00016e0006
2 changed files with 8 additions and 0 deletions
--- a/doc/plugins/contrib/nimble.mdwn
+++ b/doc/plugins/contrib/nimble.mdwn
@ -0,0 +1,6 @@
+[[!template id=plugin name=nimble author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/nimble author="[[schmonz]]"]]
+[[!tag type/format]]
+
+This plugin lets ikiwiki convert [Nimble](http://was.tl/projects/nimble/)
+to HTML.
--- a/doc/todo/support_linking_to_cgit.mdwn
+++ b/doc/todo/support_linking_to_cgit.mdwn
@ -25,6 +25,8 @@ the substitution of `\[[file]]` in `diffurl` and `historyurl`?
 >>> for the Git plugin. Please review and merge if you like
 >>> it. --[[intrigeri]]

+>>>> Ping? --[[intrigeri]]
+
 [[wishlist]]

 [[!tag patch]]