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

master
Joey Hess 2008-08-25 16:04:18 -04:00
commit 3cb1c8fa3b
1 changed files with 4 additions and 0 deletions

View File

@ -4,6 +4,8 @@ blather!!
Testing an edit in the sandbox.
Is a "SandBox" a SandBox ? or a [[SandBox]] or a Sandbox or a [[sandbox]]
----
Here's a paragraph.
@ -73,6 +75,8 @@ The haiku will change after every save, mind you.
* <a href="http://www.google.com/">plain old html link</a>
* [[foo]]
* WikiLink
* Is a "SandBox" a SandBox ? or a [[SandBox]] or a Sandbox or a [[sandbox]]
* Sandbox (no link?)
-----