Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
commit
6263c7c36c
|
@ -52,9 +52,6 @@ Bulleted list
|
||||||
* four
|
* four
|
||||||
* five
|
* five
|
||||||
|
|
||||||
----
|
|
||||||
Its a WikiWikiWorld!!
|
|
||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
|
[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
|
||||||
|
|
Loading…
Reference in New Issue