diff options
author | intrigeri <intrigeri@boum.org> | 2009-01-01 13:34:00 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-01-01 13:34:00 +0100 |
commit | 5c2f6cb8935f828274511ba5ca0d92b586632740 (patch) | |
tree | 0c72d1f73c0424236a98a1d51d192ee5e0e507ae /underlays | |
parent | c3af3840a295780e0f32df398f2dc7d34653e75e (diff) | |
parent | 8202cfe19e65867d7e41339944a8d7ca6daffa22 (diff) | |
download | ikiwiki-5c2f6cb8935f828274511ba5ca0d92b586632740.tar ikiwiki-5c2f6cb8935f828274511ba5ca0d92b586632740.tar.gz |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'underlays')
l--------- | underlays/basewiki/directive.mdwn | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/underlays/basewiki/directive.mdwn b/underlays/basewiki/directive.mdwn deleted file mode 120000 index e8ce42cba..000000000 --- a/underlays/basewiki/directive.mdwn +++ /dev/null @@ -1 +0,0 @@ -../../doc/ikiwiki/directive.mdwn
\ No newline at end of file |