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

master
Joey Hess 2011-01-13 19:47:56 -04:00
commit f351c67d2a
1 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Hello, world!
test...id Morjo
test...id Morjo $\sin(x)$
This is the [[SandBox]], a page anyone can edit to try out ikiwiki
(version [[!version ]]).