diff options
author | intrigeri <intrigeri@boum.org> | 2010-12-22 12:54:18 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-12-22 12:54:18 +0100 |
commit | a8d733130e99c3b611605d2b3d0db9a9ca8f98f7 (patch) | |
tree | 38ed3efebfa1c1c93afa325e9a57ad7e50f415c0 /doc/sandbox.mdwn | |
parent | 74055be78f46fd4997eee160a092fd7e117b6c45 (diff) | |
parent | fd6d4fda6a95f8318c33aed66c4fcf05aad72b86 (diff) |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'doc/sandbox.mdwn')
-rw-r--r-- | doc/sandbox.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index e0bdb6d03..65eee200d 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,7 @@ Hello, world! +test...id + This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). |