diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-16 17:31:15 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-16 17:31:15 -0400 |
commit | 2c05a34be17c805d929f0ad563acf857eba1d46b (patch) | |
tree | 5466b9a35d4102b606dcb154186989c8857b1b4d /IkiWiki.pm | |
parent | 4ed0a630cb8a10d583c5e88cc7a87a5cecdedc8d (diff) | |
parent | 35668b87d3247a7de6c4dbb9edd7e0d909603524 (diff) | |
download | ikiwiki-2c05a34be17c805d929f0ad563acf857eba1d46b.tar ikiwiki-2c05a34be17c805d929f0ad563acf857eba1d46b.tar.gz |
Merge commit 'intrigeri/pedigree'
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r-- | IkiWiki.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 80e317110..6a1823c5a 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -77,7 +77,8 @@ sub defaultconfig () { #{{{ adminuser => undef, adminemail => undef, plugin => [qw{mdwn link inline htmlscrubber passwordauth openid - signinedit lockedit conditional recentchanges}], + signinedit lockedit conditional recentchanges + parentlinks}], libdir => undef, timeformat => '%c', locale => undef, |