aboutsummaryrefslogtreecommitdiff
path: root/doc/sandbox.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-05-10 21:34:44 -0400
committerJoey Hess <joey@kitenet.net>2011-05-10 21:34:44 -0400
commit0e224c76cc7c9a6b9d2f2bc50f592dea91edcb39 (patch)
tree7eda806e24155c2c04aca744be1864da640d9694 /doc/sandbox.mdwn
parentb2754fa27222e7cbc6ae7616ef80f4c70aa3d7d4 (diff)
parent480fbcc25f97491e6577955e104566ac2f339ebc (diff)
downloadikiwiki-0e224c76cc7c9a6b9d2f2bc50f592dea91edcb39.tar
ikiwiki-0e224c76cc7c9a6b9d2f2bc50f592dea91edcb39.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/sandbox.mdwn')
-rw-r--r--doc/sandbox.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a5d686908..9ade25292 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -93,3 +93,6 @@ This is super cool Joey!
Testing a change!
Testing multilanguage support via utf-8: Ελληνικά. 日本語。
+
+Testing Haiku
+[[!haiku hint="argument"]]