Merge branch 'master' into pub/master

[git.ikiwiki.info.git] / doc / sandbox / hello.mdwn

diff --git a/doc/sandbox/hello.mdwn b/doc/sandbox/hello.mdwn
index 8136fdef15c800de1aa45e636ea5916dd7725310..a0e2270db3a5854300a83deef7291b3eb1c7d975 100644 (file)
--- a/doc/sandbox/hello.mdwn
+++ b/doc/sandbox/hello.mdwn
@@ -1 +1 @@
-hehe
\ No newline at end of file
+hehe hohoho