aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-02-10 12:42:56 -0400
committerJoey Hess <joey@kitenet.net>2013-02-10 12:42:56 -0400
commit22146aa4a34074bed465de7fb5999ea121808524 (patch)
tree22398a71da8831cbc2a2d34ec5ca3e687a6193d5
parentf0db3da7122f672df0c826f2b432b616be771741 (diff)
parent1de209c12b30a07a3188030d8bc55b3b92519853 (diff)
downloadikiwiki-22146aa4a34074bed465de7fb5999ea121808524.tar
ikiwiki-22146aa4a34074bed465de7fb5999ea121808524.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info
-rw-r--r--doc/sandbox.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5049a4656..757190fb0 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -67,6 +67,8 @@ test _this_ out.
_italic_
+
+opopopo
----
This **SandBox** is also a [[blog]]!