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

master
Joey Hess 2009-01-11 14:28:25 -05:00
commit 5a847e638c
1 changed files with 1 additions and 5 deletions

View File

@ -4,7 +4,6 @@ hello
testing 1..2..3!! testing 1..2..3!!
[[한글페이지]]
---- ----
Here's a paragraph. Here's a paragraph.
@ -87,9 +86,6 @@ This SandBox is also a [[blog]]!
[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-----
[[한글]]
-------- --------
This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
@ -98,4 +94,4 @@ But, of course, rsync is better.
---- ----
Let's see what happens... Let's see what happens... ~~