diff options
author | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
commit | ae474d8e14631ff519ed7d54bb64eaa0538f56d9 (patch) | |
tree | 09637db5faf2632b67b581cf04463fe4493584d4 /doc/plugins/textile | |
parent | 0314ed459ba1c49fad9170a54cc05f1c9e9c96bf (diff) | |
parent | 08e4472fc469c630ebef93e16a66a5a69d9cb33a (diff) |
Merge commit 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/plugins/textile')
-rw-r--r-- | doc/plugins/textile/discussion.mdwn | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/plugins/textile/discussion.mdwn b/doc/plugins/textile/discussion.mdwn deleted file mode 100644 index 945c9b46d..000000000 --- a/doc/plugins/textile/discussion.mdwn +++ /dev/null @@ -1 +0,0 @@ -.
\ No newline at end of file |