diff options
| author | intrigeri <intrigeri@boum.org> | 2010-06-25 14:38:37 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-06-25 14:38:37 +0200 |
| commit | 9f401d6617a11efcedda1c956b2ccea061a7540f (patch) | |
| tree | a5648589b38487427a58a7ebacfdc036a5dd102a /doc/sandbox | |
| parent | 73f4a8835876c8cb07808367cd72d9ae972893e8 (diff) | |
| parent | 71950b2ae5ff6fd3b631c5504455cc07699b1c11 (diff) | |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/po.pm
Diffstat (limited to 'doc/sandbox')
| -rw-r--r-- | doc/sandbox/danc.mdwn | 1 | ||||
| -rw-r--r-- | doc/sandbox/prova_blog.html | 8 | ||||
| -rw-r--r-- | doc/sandbox/sidebar.mdwn | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/doc/sandbox/danc.mdwn b/doc/sandbox/danc.mdwn new file mode 100644 index 000000000..9766475a4 --- /dev/null +++ b/doc/sandbox/danc.mdwn @@ -0,0 +1 @@ +ok diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html new file mode 100644 index 000000000..d69937ea8 --- /dev/null +++ b/doc/sandbox/prova_blog.html @@ -0,0 +1,8 @@ +Questa รจ una prova. +Vediamo se funziona + +<pre> +#!/bin/bash + +echo "ciao" +</pre> diff --git a/doc/sandbox/sidebar.mdwn b/doc/sandbox/sidebar.mdwn new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/doc/sandbox/sidebar.mdwn @@ -0,0 +1 @@ +test |