diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-29 15:40:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-29 15:40:23 -0400 |
| commit | 64def3eaeae4ddbe5cee61d08612da1eb1bc54d3 (patch) | |
| tree | fd06c2a8227fe3c5636b94b3337f00ba762db9ac /doc | |
| parent | a02c3f46ea79313a4e0f6df924efac067b0fd177 (diff) | |
| parent | d6c73e9ef6dcd89ade9ca64755d683ac88d46ae7 (diff) | |
| download | ikiwiki-64def3eaeae4ddbe5cee61d08612da1eb1bc54d3.tar ikiwiki-64def3eaeae4ddbe5cee61d08612da1eb1bc54d3.tar.gz | |
Merge branch 'master' into tova
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/plugins/txt/discussion.mdwn (renamed from doc/plugins/plaintext/discussion.mdwn) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/plugins/plaintext/discussion.mdwn b/doc/plugins/txt/discussion.mdwn index 6b907e65c..6b907e65c 100644 --- a/doc/plugins/plaintext/discussion.mdwn +++ b/doc/plugins/txt/discussion.mdwn |