summaryrefslogtreecommitdiff
path: root/doc/examples/blog/posts/ugachaka
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-12-29 13:08:18 -0400
committerJoey Hess <joey@kitenet.net>2010-12-29 13:08:18 -0400
commit468c1c4496eade7a1a4ff6fe22aa82f5eefd3164 (patch)
tree00bd4a95eead4f981acec81e37ec6cf8d2dcea2a /doc/examples/blog/posts/ugachaka
parent1c430def77b81caaee1fe05299d141b04051e62a (diff)
parent0d9da41b6be64d9d5bd192e918fd89a1742fe7d0 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/examples/blog/posts/ugachaka')
-rw-r--r--doc/examples/blog/posts/ugachaka/discussion.mdwn1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/examples/blog/posts/ugachaka/discussion.mdwn b/doc/examples/blog/posts/ugachaka/discussion.mdwn
new file mode 100644
index 000000000..387db1f52
--- /dev/null
+++ b/doc/examples/blog/posts/ugachaka/discussion.mdwn
@@ -0,0 +1 @@
+jackie chan vs chuck norris.